Fix pipeline failures

johnmcfarlane · Oct 25, 2023 · 8b58106 · 8b58106
1 parent 781d03f
commit 8b58106
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,6 @@ jobs:
       - name: Cache Report
         run: |
           ccache -s
-          conan search
 
       - name: Initialise Conan
         run: |
@@ -64,10 +63,6 @@ jobs:
       - name: Test library
         run: conan build --test $GITHUB_WORKSPACE
 
-      - name: Cache Report
-        run: |
-          conan search
-
   # Build and test many combinations on Linux/OS X using Conan
   conan:
     strategy:
@@ -189,7 +184,6 @@ jobs:
       - name: Cache Report
         run: |
           ccache -s
-          conan search
 
       - name: Initialise Conan
         run: |
@@ -219,10 +213,6 @@ jobs:
           ./test/benchmark/test-benchmark --benchmark_format=csv | tee result.csv \
           "${GITHUB_WORKSPACE}"/test/benchmark/report.py result.csv
 
-      - name: Cache Report
-        run: |
-          conan search
-
   # Build and test on Windows using Conan
   windows:
     strategy:
@@ -270,10 +260,6 @@ jobs:
         run: |
           pip.exe install conan;
 
-      - name: Cache Report
-        run: |
-          conan search
-
       - name: Create build directory
         run: mkdir ${{runner.workspace}}\build
 
@@ -295,10 +281,6 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         run: test\benchmark\${{matrix.build_type}}\test-benchmark.exe
 
-      - name: Cache Report
-        run: |
-          conan search
-
   # Test documentation generation
   doxygen:
     runs-on: ubuntu-18.04

diff --git 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

diff --git 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