diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c692f49..e454686 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,17 +21,19 @@ jobs: build: strategy: matrix: - toolset: [mingw, vs2022] + os: [ubuntu-latest, windows-2022, windows-2025] platform: [x64, x86] configuration: [Debug, RelWithDebInfo] include: - boost-version: 1.81.0 # MinGW builds are done on Linux, since it's more up-to-date there, # and it's much faster. - - {toolset: mingw, os: ubuntu-latest} - - {toolset: vs2022, os: windows-2025} + - {os: ubuntu-latest, toolset: mingw} + - {os: windows-2022, toolset: vs2022} + # At the moment, the 2025 image still has VS 2022. + - {os: windows-2025, toolset: vs2022} runs-on: '${{ matrix.os }}' - name: 'Build: ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' + name: 'Build: ${{ matrix.os }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' defaults: run: shell: pwsh @@ -67,7 +69,7 @@ jobs: - name: Upload binaries uses: actions/upload-artifact@v6 with: - name: 'winapi-common-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'winapi-common-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: './build/install/' if-no-files-found: error - name: Test @@ -76,7 +78,7 @@ jobs: - name: Upload test logs uses: actions/upload-artifact@v6 with: - name: 'test_logs-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' + name: 'test_logs-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}' path: | ./build/**/*_tests.log ./build/**/*_report.txt |