From 7c6512ff72a2284b532a3ae883fd7d4833631263 Mon Sep 17 00:00:00 2001 From: gabime Date: Fri, 29 Nov 2024 10:22:43 +0200 Subject: [PATCH] Fix ci --- .github/workflows/linux.yml | 7 ++----- .github/workflows/macos.yml | 2 -- .github/workflows/windows.yml | 6 +----- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7c859d4ed..6afd330e1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -50,12 +50,11 @@ jobs: cmake .. \ -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ -DCMAKE_CXX_STANDARD=${{ matrix.config.cppstd }} \ - -DSPDLOG_BUILD_EXAMPLE=${{ matrix.config.examples || 'ON' }} \ - -DSPDLOG_BUILD_EXAMPLE_HO=${{ matrix.config.examples || 'ON' }} \ + -DSPDLOG_BUILD_EXAMPLE=${{ matrix.config.examples || 'ON' }} \ -DSPDLOG_BUILD_WARNINGS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_TESTS=ON \ - -DSPDLOG_BUILD_TESTS_HO=OFF \ + -DSPDLOG_SANITIZE_ADDRESS=${{ matrix.config.asan || 'OFF' }} \ -DSPDLOG_SANITIZE_ADDRESS=${{ matrix.config.asan || 'OFF' }} \ -DSPDLOG_SANITIZE_THREAD=${{ matrix.config.tsan || 'OFF' }} make -j 4 @@ -76,11 +75,9 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_STANDARD=17 \ -DSPDLOG_BUILD_EXAMPLE=ON \ - -DSPDLOG_BUILD_EXAMPLE_HO=ON \ -DSPDLOG_BUILD_WARNINGS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_TESTS=ON \ - -DSPDLOG_BUILD_TESTS_HO=OFF \ -DSPDLOG_SANITIZE_ADDRESS=OFF make -j 4 ctest -j 4 --output-on-failure diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 40decfb4d..fab57b861 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,11 +18,9 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_STANDARD=17 \ -DSPDLOG_BUILD_EXAMPLE=ON \ - -DSPDLOG_BUILD_EXAMPLE_HO=ON \ -DSPDLOG_BUILD_WARNINGS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_TESTS=ON \ - -DSPDLOG_BUILD_TESTS_HO=OFF \ -DSPDLOG_SANITIZE_ADDRESS=OFF make -j 4 ctest -j 4 --output-on-failure diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 004e31fa9..6148d518b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: windows-latest strategy: - fail-fast: true + fail-fast: false matrix: config: - GENERATOR: "Visual Studio 17 2022" @@ -55,9 +55,7 @@ jobs: -D SPDLOG_WCHAR_SUPPORT=${{ matrix.config.WCHAR }} ` -D SPDLOG_WCHAR_FILENAMES=${{ matrix.config.WCHAR_FILES }} ` -D SPDLOG_BUILD_EXAMPLE=${{ matrix.config.BUILD_EXAMPLE }} ` - -D SPDLOG_BUILD_EXAMPLE_HO=${{ matrix.config.BUILD_EXAMPLE }} ` -D SPDLOG_BUILD_TESTS=ON ` - -D SPDLOG_BUILD_TESTS_HO=OFF ` -D SPDLOG_BUILD_WARNINGS=${{ matrix.config.FATAL_ERRORS }} ` -D SPDLOG_USE_STD_FORMAT=${{ matrix.config.USE_STD_FORMAT }} ` -D CMAKE_CXX_STANDARD=${{ matrix.config.CXX_STANDARD }} .. @@ -118,9 +116,7 @@ jobs: -D SPDLOG_WCHAR_SUPPORT=${{ matrix.config.WCHAR }} ` -D SPDLOG_WCHAR_FILENAMES=${{ matrix.config.WCHAR_FILES }} ` -D SPDLOG_BUILD_EXAMPLE=${{ matrix.config.BUILD_EXAMPLE }} ` - -D SPDLOG_BUILD_EXAMPLE_HO=${{ matrix.config.BUILD_EXAMPLE }} ` -D SPDLOG_BUILD_TESTS=ON ` - -D SPDLOG_BUILD_TESTS_HO=OFF ` -D SPDLOG_BUILD_WARNINGS=${{ matrix.config.FATAL_ERRORS }} ` -D SPDLOG_USE_STD_FORMAT=${{ matrix.config.USE_STD_FORMAT }} ` -D CMAKE_CXX_STANDARD=${{ matrix.config.CXX_STANDARD }} ..