Skip to content

Commit

Permalink
Fix pipeline failures
Browse files Browse the repository at this point in the history
  • Loading branch information
John McFarlane committed Dec 22, 2023
1 parent 781d03f commit 69b403b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
# Deploy release
deploy:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: johnmcfarlane/cnl_ci:gcc-10
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
jobs:
# Build and test many combinations on Linux/OS X using Conan
clang-tidy:
if: false
strategy:
matrix:
int128: ["True", "False"]
Expand Down Expand Up @@ -225,6 +226,7 @@ jobs:
# Build and test on Windows using Conan
windows:
if: false
strategy:
matrix:
name: [2022-64, 2022-32, 2019-64, 2019-32]
Expand Down Expand Up @@ -301,7 +303,7 @@ jobs:
# Test documentation generation
doxygen:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: johnmcfarlane/cnl_ci:base-21.10
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -391,7 +393,7 @@ jobs:

# Install on mature Linux distro using only CMake
install:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wide-integer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
# Check for updates to wide-integer library
update-check:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: johnmcfarlane/cnl_ci:base-21.10
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 3 additions & 1 deletion test/unit/presentations/cppcon2017.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace filesystem = std::filesystem;
template<typename Rep = int, int Exponent = 0, int Radix = 2>
using fixed_point = cnl::scaled_integer<Rep, cnl::power<Exponent, Radix>>;

#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
template<>
struct std::hash<filesystem::path> {
auto operator()(filesystem::path const& p) const
Expand All @@ -30,6 +30,7 @@ struct std::hash<filesystem::path> {
};
#endif

#if (defined(__clang__) && (__clang_major__ > 13)) // wg21.link/LWG3657
namespace a {
using std::unique_ptr;
using std::unordered_map;
Expand All @@ -38,6 +39,7 @@ namespace a {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)
unordered_map<filesystem::path, unique_ptr<byte[]>> cache;
}
#endif

namespace b {
void f()
Expand Down
4 changes: 3 additions & 1 deletion test/unit/presentations/cppdub2018.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using cnl::make_scaled_integer;
using cnl::power;
using cnl::scaled_integer;

#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
template<>
struct std::hash<filesystem::path> {
auto operator()(filesystem::path const& p) const
Expand All @@ -32,6 +32,7 @@ struct std::hash<filesystem::path> {
};
#endif

#if (defined(__clang__) && (__clang_major__ > 13)) // wg21.link/LWG3657
namespace a {
using std::unique_ptr;
using std::unordered_map;
Expand All @@ -40,6 +41,7 @@ namespace a {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)
unordered_map<filesystem::path, unique_ptr<byte[]>> cache;
}
#endif

namespace b {
#if defined(CNL_IOSTREAMS_ENABLED)
Expand Down

0 comments on commit 69b403b

Please sign in to comment.