From f3cca2b66edf82730a2ec102085a5e2228f6e9fc Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 9 Mar 2022 17:26:03 +0100 Subject: [PATCH 1/2] CI-windows.yml: added "windows-2022" --- .github/workflows/CI-windows.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index b9df721f..b909e4b2 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -15,8 +15,7 @@ jobs: build: strategy: matrix: - # windows 2016 should default to VS 2017. Not supported by setup-msbuild - os: [windows-2019] + os: [windows-2019, windows-2022] fail-fast: false runs-on: ${{ matrix.os }} @@ -28,8 +27,15 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - name: Run cmake + if: matrix.os == 'windows-2019' run: | - cmake -G "Visual Studio 16" . -A x64 + cmake -G "Visual Studio 16 2019" -A x64 . + dir + + - name: Run cmake + if: matrix.os == 'windows-2022' + run: | + cmake -G "Visual Studio 17 2022" -A x64 . dir - name: Build From d9e7c44021aba989b56fbca0dfa94d846a34b989 Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 9 Mar 2022 17:32:10 +0100 Subject: [PATCH 2/2] CI-windows.yml: added missing error checks --- .github/workflows/CI-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index b909e4b2..264a09c6 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -29,20 +29,20 @@ jobs: - name: Run cmake if: matrix.os == 'windows-2019' run: | - cmake -G "Visual Studio 16 2019" -A x64 . + cmake -G "Visual Studio 16 2019" -A x64 . || exit /b !errorlevel! dir - name: Run cmake if: matrix.os == 'windows-2022' run: | - cmake -G "Visual Studio 17 2022" -A x64 . + cmake -G "Visual Studio 17 2022" -A x64 . || exit /b !errorlevel! dir - name: Build run: | - msbuild -m simplecpp.sln /p:Configuration=Release /p:Platform=x64 + msbuild -m simplecpp.sln /p:Configuration=Release /p:Platform=x64 || exit /b !errorlevel! - name: Test run: | - .\Release\testrunner.exe + .\Release\testrunner.exe || exit /b !errorlevel!