From 12f7e4e72df3705762f9a23c527b80142918aadc Mon Sep 17 00:00:00 2001 From: gabime Date: Sat, 2 Nov 2024 09:36:58 +0200 Subject: [PATCH] try matrix for win ci --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aacc9b50..7c7c5925 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: BUILD_EXAMPLE: 'ON' USE_STD_FORMAT: 'OFF' CXX_STANDARD: 11 - - GENERATOR: '"Visual Studio 15 2017 Win64"' + - GENERATOR: '"Visual Studio 15 2017" -A x64' BUILD_TYPE: Release BUILD_SHARED: 'ON' FATAL_ERRORS: 'OFF' @@ -110,7 +110,7 @@ jobs: BUILD_EXAMPLE: 'ON' USE_STD_FORMAT: 'OFF' CXX_STANDARD: 11 - - GENERATOR: '"Visual Studio 15 2017 Win64"' + - GENERATOR: '"Visual Studio 15 2017" -A x64' BUILD_TYPE: Release BUILD_SHARED: 'ON' FATAL_ERRORS: 'OFF' @@ -158,17 +158,17 @@ jobs: run: | mkdir build cd build - cmake -G ${{ matrix.config.GENERATOR }} ' - -D CMAKE_BUILD_TYPE=${{ matrix.config.BUILD_TYPE }} ' - -D BUILD_SHARED_LIBS=${{ matrix.config.BUILD_SHARED }} ' - -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 }} ' + cmake -G ${{ matrix.config.GENERATOR }} ` + -D CMAKE_BUILD_TYPE=${{ matrix.config.BUILD_TYPE }} ` + -D BUILD_SHARED_LIBS=${{ matrix.config.BUILD_SHARED }} ` + -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 }} .. - name: Build