Skip to content

Commit 71d0bed

Browse files
Paweł Kotiukpktiuk
authored andcommitted
ci: Bump windows CI runner to 2022 version
1 parent 0cb0893 commit 71d0bed

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,35 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
include:
77-
- name: WinServer2019 MinGW QT5
78-
image: windows-2019
77+
- name: WinServer2022 MinGW QT5
78+
image: windows-2022
7979
qt-version: "5.15.2"
8080
shell: msys2 {0}
81+
cmake-args: -G Ninja
8182
build-type: Debug
8283
qt-arch: "win64_mingw81"
8384
experimental: false
84-
- name: WinServer2019 MinGW QT6
85-
image: windows-2019
85+
- name: WinServer2022 MinGW QT6
86+
image: windows-2022
8687
qt-version: "6.7"
8788
shell: msys2 {0}
89+
cmake-args: -G Ninja
8890
build-type: Debug
8991
qt-arch: "win64_mingw"
9092
experimental: false
91-
- name: WinServer2019 MSVC QT5
92-
image: windows-2019
93+
- name: WinServer2022 MSVC QT5
94+
image: windows-2022
9395
qt-version: "5.15.2"
9496
shell: cmd
95-
cmake-args: -G "Visual Studio 16 2019" "-DSDL2_PATH=%WORKSPACE_DIR%/sdl2/" "-DSDL2_LIBRARY=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.lib" "-DSDL2_INCLUDE_DIR=%WORKSPACE_DIR%/sdl2/" "-DSDL2_DLL_LOCATION_DIR=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.dll"
97+
cmake-args: -G "Visual Studio 17 2022" "-DSDL2_PATH=%WORKSPACE_DIR%/sdl2/" "-DSDL2_LIBRARY=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.lib" "-DSDL2_INCLUDE_DIR=%WORKSPACE_DIR%/sdl2/" "-DSDL2_DLL_LOCATION_DIR=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.dll"
9698
build-type: Debug
9799
qt-arch: "win64_msvc2019_64"
98100
experimental: false
99-
- name: WinServer2019 MSVC QT6
100-
image: windows-2019
101+
- name: WinServer2022 MSVC QT6
102+
image: windows-2022
101103
qt-version: "6.7"
102104
shell: cmd
103-
cmake-args: -G "Visual Studio 16 2019" "-DSDL2_PATH=%WORKSPACE_DIR%/sdl2/" "-DSDL2_LIBRARY=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.lib" "-DSDL2_INCLUDE_DIR=%WORKSPACE_DIR%/sdl2/" "-DSDL2_DLL_LOCATION_DIR=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.dll"
105+
cmake-args: -G "Visual Studio 17 2022" "-DSDL2_PATH=%WORKSPACE_DIR%/sdl2/" "-DSDL2_LIBRARY=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.lib" "-DSDL2_INCLUDE_DIR=%WORKSPACE_DIR%/sdl2/" "-DSDL2_DLL_LOCATION_DIR=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.dll"
104106
build-type: Debug
105107
qt-arch: "win64_msvc2019_64"
106108
experimental: false
@@ -121,6 +123,7 @@ jobs:
121123
install: >-
122124
mingw-w64-x86_64-toolchain
123125
mingw-w64-x86_64-ninja
126+
mingw-w64-x86_64-cmake
124127
msystem: mingw64
125128
release: false
126129
#mingw-w64-x86_64-SDL2 not installed above because of: https://github.com/AntiMicroX/antimicrox/issues/465
@@ -143,7 +146,7 @@ jobs:
143146
uses: TheMrMilchmann/setup-msvc-dev@v3
144147
with:
145148
arch: x64
146-
toolset: 14.1
149+
toolset: 14
147150

148151
- name: Install Qt
149152
uses: jurplel/install-qt-action@v4

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139

140140
build-windows-packages:
141141
name: Create Windows packages
142-
runs-on: windows-2019
142+
runs-on: windows-2022
143143
defaults:
144144
run:
145145
shell: msys2 {0}
@@ -155,6 +155,7 @@ jobs:
155155
mingw-w64-x86_64-ninja
156156
mingw-w64-x86_64-nsis
157157
mingw-w64-x86_64-openssl
158+
mingw-w64-x86_64-cmake
158159
msystem: mingw64
159160
release: false
160161
# mingw-w64-x86_64-SDL2 not installed above because of: https://github.com/AntiMicroX/antimicrox/issues/465

0 commit comments

Comments
 (0)