From bdfd8968614d5187be7baa580b30295bd4c42b04 Mon Sep 17 00:00:00 2001 From: ado Date: Sat, 29 Jul 2023 15:17:39 +0200 Subject: [PATCH] Fix msvc vs 16 ci --- .../{win-latest-msvc.yaml => win-msvc.yml} | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) rename .github/workflows/{win-latest-msvc.yaml => win-msvc.yml} (70%) diff --git a/.github/workflows/win-latest-msvc.yaml b/.github/workflows/win-msvc.yml similarity index 70% rename from .github/workflows/win-latest-msvc.yaml rename to .github/workflows/win-msvc.yml index 91de658..62405fa 100644 --- a/.github/workflows/win-latest-msvc.yaml +++ b/.github/workflows/win-msvc.yml @@ -1,4 +1,4 @@ -name: win-latest-msvc-ci +name: win-msvc-ci on: push: @@ -25,16 +25,22 @@ jobs: run: shell: bash - runs-on: windows-latest + runs-on: {{ matrix.config.os }} strategy: fail-fast: false matrix: - vs: ["Visual Studio 16 2019", "Visual Studio 17 2022"] + config: + - os: windows-2019 + vs: "Visual Studio 16 2019" + + - os: windows-latest + vs: "Visual Studio 17 2022" + build: [Debug, Release] platform: [Win32, x64] - name: "${{matrix.vs}}:${{matrix.platform}}:${{matrix.build}}" + name: "${{matrix.config.vs}}:${{matrix.platform}}:${{matrix.build}}" steps: - name: checkout @@ -44,7 +50,7 @@ jobs: run: script/ci_install_deps.sh - name: Configure - run: cmake -S test -B build -G "${{ matrix.vs }}" -A ${{ matrix.platform }} -D CMAKE_BUILD_TYPE=${{ matrix.build }} + run: cmake -S test -B build -G "${{ matrix.config.vs }}" -A ${{ matrix.platform }} --config ${{ matrix.build }} - name: Build run: cmake --build build -j ${{ steps.cores.outputs.count }}