@@ -194,6 +194,11 @@ jobs:
194194 runs-on : windows-latest
195195 steps :
196196 - uses : actions/checkout@main
197+ - name : Setup msbuild
198+ uses : microsoft/setup-msbuild@v2
199+ with :
200+ vs-version : 17.12
201+ msbuild-architecture : x64
197202 - name : Install Qt
198203 uses : jurplel/install-qt-action@v4
199204 with :
@@ -202,16 +207,11 @@ jobs:
202207 target : desktop
203208 arch : win64_msvc2022_64
204209 setup-python : false
205- - name : Checkout msbuild
206- uses : microsoft/setup-msbuild@v2
207- with :
208- vs-version : 17.12
209- msbuild-architecture : x64
210210 - name : Install tools
211211 run : |
212212 choco install sqlite -y
213213 choco install cmake -y
214- - name : Build for debug mode
214+ - name : Debug build
215215 shell : cmd
216216 run : |
217217 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
@@ -224,12 +224,12 @@ jobs:
224224 cd ..\tools
225225 nmake
226226 nmake install
227- - name : Test modules
227+ - name : Module test
228228 shell : cmd
229229 run : |
230230 cd src/test
231231 call testall.bat
232- - name : Build for release mode
232+ - name : Release build
233233 shell : cmd
234234 run : |
235235 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
@@ -241,31 +241,36 @@ jobs:
241241 cd ..\tools
242242 nmake
243243 nmake install
244- - name : Test release
244+ - name : Release test
245245 working-directory : tools\test\releasetest
246246 run : |
247247 .\releasetest.bat
248248
249- build-windows-qt67 -msvc2019 :
249+ build-windows-qt68 -msvc2019 :
250250 runs-on : windows-latest
251251 steps :
252252 - uses : actions/checkout@main
253+ - name : Setup msbuild
254+ uses : microsoft/setup-msbuild@v2
255+ with :
256+ vs-version : 16.11
257+ msbuild-architecture : x64
253258 - name : Install Qt
254259 uses : jurplel/install-qt-action@v4
255260 with :
256- version : ' 6.7.3'
257- host : ' windows'
258- target : ' desktop'
259- - name : Install VisualStudio tools
261+ version : 6.8
262+ host : windows
263+ target : desktop
264+ arch : win64_msvc2022_64
265+ setup-python : false
266+ - name : Install tools
260267 run : |
261- choco install visualstudio2019community -y
262- choco install visualstudio2019-workload-nativedesktop -y
263268 choco install sqlite -y
264269 choco install cmake -y
265- - name : Build for debug mode
270+ - name : Debug build
266271 shell : cmd
267272 run : |
268- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars64.bat"
273+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise \VC\Auxiliary\Build\vcvars64.bat"
269274 set CL=/MP
270275 qmake -version
271276 call configure.bat --enable-debug
@@ -275,15 +280,15 @@ jobs:
275280 cd ..\tools
276281 nmake
277282 nmake install
278- - name : Test modules
283+ - name : Module test
279284 shell : cmd
280285 run : |
281286 cd src/test
282287 call testall.bat
283- - name : Build for release mode
288+ - name : Release build
284289 shell : cmd
285290 run : |
286- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars64.bat"
291+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise \VC\Auxiliary\Build\vcvars64.bat"
287292 set CL=/MP
288293 call configure.bat
289294 cd src
@@ -292,7 +297,7 @@ jobs:
292297 cd ..\tools
293298 nmake
294299 nmake install
295- - name : Test release
300+ - name : Release test
296301 working-directory : tools\test\releasetest
297302 run : |
298303 .\releasetest.bat
@@ -301,22 +306,27 @@ jobs:
301306 runs-on : windows-latest
302307 steps :
303308 - uses : actions/checkout@main
309+ - name : Setup msbuild
310+ uses : microsoft/setup-msbuild@v2
311+ with :
312+ vs-version : 16.11
313+ msbuild-architecture : x64
304314 - name : Install Qt
305315 uses : jurplel/install-qt-action@v4
306316 with :
307- version : ' 6.5.2'
308- host : ' windows'
309- target : ' desktop'
310- - name : Install VisualStudio tools
317+ version : 6.5
318+ host : windows
319+ target : desktop
320+ arch : win64_msvc2022_64
321+ setup-python : false
322+ - name : Install tools
311323 run : |
312- choco install visualstudio2019community -y
313- choco install visualstudio2019-workload-nativedesktop -y
314324 choco install sqlite -y
315325 choco install cmake -y
316- - name : Build for debug mode
326+ - name : Debug build
317327 shell : cmd
318328 run : |
319- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars64.bat"
329+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise \VC\Auxiliary\Build\vcvars64.bat"
320330 set CL=/MP
321331 qmake -version
322332 call configure.bat --enable-debug
@@ -326,15 +336,15 @@ jobs:
326336 cd ..\tools
327337 nmake
328338 nmake install
329- - name : Test modules
339+ - name : Module test
330340 shell : cmd
331341 run : |
332342 cd src/test
333343 call testall.bat
334- - name : Build for release mode
344+ - name : Release build
335345 shell : cmd
336346 run : |
337- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars64.bat"
347+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise \VC\Auxiliary\Build\vcvars64.bat"
338348 set CL=/MP
339349 call configure.bat
340350 cd src
@@ -343,7 +353,7 @@ jobs:
343353 cd ..\tools
344354 nmake
345355 nmake install
346- - name : Test release
356+ - name : Release test
347357 working-directory : tools\test\releasetest
348358 run : |
349359 .\releasetest.bat
0 commit comments