Skip to content

Commit d1bd03a

Browse files
authored
Merge pull request #2470 from Margen67/ci
CI: Upgrade to VS2022, update actions
2 parents ec9934a + c64a077 commit d1bd03a

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/CI.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,20 @@ on:
2222

2323
jobs:
2424
build-windows:
25-
name: Build (Windows, ${{ matrix.configuration }}, VS${{ matrix.vsver }}) # runner.os doesn't work here
26-
runs-on: windows-${{ matrix.vsver }}
25+
name: Build (Windows, ${{ matrix.configuration }}) # runner.os doesn't work here
26+
runs-on: windows-2025
2727
env:
2828
POWERSHELL_TELEMETRY_OPTOUT: 1
2929
strategy:
3030
fail-fast: false
3131
matrix:
3232
configuration: [Release, Debug]
33-
vsver: [2019]
34-
winver: [7]
35-
sdkver: [10.0.22621.0]
3633
steps:
3734
- uses: actions/checkout@v4
3835
with:
3936
submodules: recursive
4037
- name: Generate CMake files
41-
run: cmake -B build -A Win32,version=${{ matrix.sdkver }} -DCMAKE_SYSTEM_VERSION=${{ matrix.winver }} -DBUILD_CXBXR_DEBUGGER=ON
38+
run: cmake -B build -A Win32 -DBUILD_CXBXR_DEBUGGER=ON -DCMAKE_SYSTEM_VERSION=7
4239
- name: Build
4340
run: cmake --build build --config ${{ matrix.configuration }} -j $env:NUMBER_OF_PROCESSORS
4441
- name: Prepare artifacts
@@ -47,7 +44,7 @@ jobs:
4744
- uses: actions/upload-artifact@v4
4845
if: matrix.configuration == 'Release'
4946
with:
50-
name: CxbxReloaded-${{ matrix.configuration }}-VS${{ matrix.vsver }}
47+
name: CxbxReloaded-${{ matrix.configuration }}
5148
path: artifacts/bin
5249
if-no-files-found: error
5350

import/SDL2

Submodule SDL2 updated 1436 files

0 commit comments

Comments
 (0)