From 8b58106e705ad16a0bc7a6e8258753ed0f415449 Mon Sep 17 00:00:00 2001 From: John McFarlane Date: Wed, 25 Oct 2023 07:00:53 +0100 Subject: [PATCH] Fix pipeline failures --- .github/workflows/test.yml | 18 ------------------ test/unit/presentations/cppcon2017.cpp | 2 +- test/unit/presentations/cppdub2018.cpp | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d60a3acc1..b45d60e1a 100644 --- 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 index f044670f4..4ee2c2c0e 100644 --- a/test/unit/presentations/cppcon2017.cpp +++ b/test/unit/presentations/cppcon2017.cpp @@ -20,7 +20,7 @@ namespace filesystem = std::filesystem; template using fixed_point = 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 { auto operator()(filesystem::path const& p) const diff --git a/test/unit/presentations/cppdub2018.cpp b/test/unit/presentations/cppdub2018.cpp index 0a9e84076..bebefdcd6 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 { auto operator()(filesystem::path const& p) const