From 6c7201553dab96c1b3223a5d1a60561927de6682 Mon Sep 17 00:00:00 2001 From: gabime Date: Fri, 1 Nov 2024 18:41:17 +0200 Subject: [PATCH] Fix win ci --- .github/workflows/ci.yml | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4c616ee..174e6610 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,6 @@ name: ci on: [push, pull_request] jobs: - # --------------------------------------------------------------------------------- - # Linux - # --------------------------------------------------------------------------------- build_linux: runs-on: ubuntu-latest defaults: @@ -59,9 +56,6 @@ jobs: make -j2 ctest -j2 --output-on-failure - # --------------------------------------------------------------------------------- - # OSX - # --------------------------------------------------------------------------------- build_osx: runs-on: macOS-latest name: "OS X Clang (C++11, Release)" @@ -82,18 +76,10 @@ jobs: -DSPDLOG_SANITIZE_ADDRESS=OFF make -j2 ctest -j2 --output-on-failure -# --------------------------------------------------------------------------------- -# Windows -# --------------------------------------------------------------------------------- - build_windows: + + build_windows_msvc_2022: runs-on: windows-latest - strategy: - matrix: - msvc_version: - - { name: "Visual Studio 17 2022", generator: "Visual Studio 17 2022" } - - name: "Windows ${{ matrix.msvc_version.name }} (C++11, Release)" - + name: "Windows MSVC 2022 (C++11, Release)" steps: - name: Checkout code uses: actions/checkout@v2 @@ -106,9 +92,9 @@ jobs: - name: Configure CMake run: | - cmake -S . -B build -G "${{ matrix.msvc_version.generator }}" -A x64\ + cmake -S . -B build -G "Visual Studio 17 2022" -A x64 \ -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CXX_STANDARD=11 + -DCMAKE_CXX_STANDARD=11 -DSPDLOG_BUILD_EXAMPLE=ON -DSPDLOG_BUILD_EXAMPLE_HO=ON -DSPDLOG_BUILD_WARNINGS=ON @@ -121,4 +107,5 @@ jobs: run: cmake --build build --config Release - name: Run Tests - run: ctest --test-dir build -C Release --output-on-failure --verbose \ No newline at end of file + run: ctest --test-dir build -C Release --output-on-failure --verbose +