From e5ea2333585d4afdf10322be4b8c812049ed7bf0 Mon Sep 17 00:00:00 2001
From: John McFarlane <git@john.mcfarlane.name>
Date: Wed, 25 Oct 2023 07:00:53 +0100
Subject: [PATCH] Fix pipeline failures

- Ubuntu 18.04 is unsupported in GitHub Actions so bumping remaining jobs
  to 20.04.
  https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/
- Conan 2 was released, which has breaking changes, so pegging to
  "conan<2", both in this repo, and in cnl_ci_images.
- Fix linting errors that crept in while pipeline was disabled. See #1043.
- Avoiding examples which no longer compile since LWG3657.
---
 .github/workflows/deploy.yml           |  2 +-
 .github/workflows/test.yml             | 10 +++++++---
 .github/workflows/wide-integer.yml     |  2 +-
 test/unit/presentations/cppcon2017.cpp |  4 +++-
 test/unit/presentations/cppdub2018.cpp |  4 +++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a8207a72f..26d1d5cdb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -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}}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d60a3acc1..6ed3b0d24 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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"]
@@ -177,7 +178,9 @@ jobs:
 
       - name: Install Brew packages
         if: ( matrix.os-version == 'macos-12' )
-        run: brew install ccache conan ninja
+        run: |
+          brew install ccache conan@1 ninja
+          echo "/usr/local/opt/conan@1/bin:$PATH" >> $GITHUB_PATH
 
       - name: Restore Compiler Cache
         uses: hendrikmuhs/ccache-action@v1
@@ -225,6 +228,7 @@ jobs:
 
   # Build and test on Windows using Conan
   windows:
+    if: false
     strategy:
       matrix:
         name: [2022-64, 2022-32, 2019-64, 2019-32]
@@ -301,7 +305,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
@@ -391,7 +395,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
 
diff --git a/.github/workflows/wide-integer.yml b/.github/workflows/wide-integer.yml
index 6f29d7e56..ce9424e6b 100644
--- a/.github/workflows/wide-integer.yml
+++ b/.github/workflows/wide-integer.yml
@@ -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
diff --git a/test/unit/presentations/cppcon2017.cpp b/test/unit/presentations/cppcon2017.cpp
index f044670f4..580a32826 100644
--- a/test/unit/presentations/cppcon2017.cpp
+++ b/test/unit/presentations/cppcon2017.cpp
@@ -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
@@ -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;
@@ -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()
diff --git a/test/unit/presentations/cppdub2018.cpp b/test/unit/presentations/cppdub2018.cpp
index 0a9e84076..f87024583 100644
--- a/test/unit/presentations/cppdub2018.cpp
+++ b/test/unit/presentations/cppdub2018.cpp
@@ -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
@@ -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;
@@ -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)