@@ -206,35 +206,34 @@ jobs:
206206 choco install visualstudio2022buildtools
207207 choco install visualstudio2022-workload-nativedesktop
208208 choco install visualstudio2022-workload-vctools
209- # choco install jom
210209 - name : Build for debug mode
211210 shell : cmd
212211 run : |
213212 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
214213 set CL=/MP
215214 qmake -version
216- .\ configure.bat --enable-debug
215+ call configure.bat --enable-debug
217216 cd src
218217 nmake
219218 nmake install
220219 cd ..\tools
221220 nmake
222221 nmake install
223222 cd test
224- testall.bat
223+ call testall.bat
225224 - name : Build for release mode
226225 shell : cmd
227226 run : |
228227 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
229228 set CL=/MP
230- .\ configure.bat
229+ call configure.bat
231230 cd src
232231 nmake
233232 nmake install
234233 cd ..\tools
235234 nmake
236235 nmake install
237- tools\releasetest\releasetest.bat
236+ call tools\releasetest\releasetest.bat
238237
239238 build-windows-msvc2019-qt67 :
240239 runs-on : windows-latest
@@ -248,11 +247,10 @@ jobs:
248247 target : ' desktop'
249248 - name : Install VisualStudio tools
250249 run : |
251- choco install visualstudio2019community --package-parameters "--includeRecommended --includeOptional "
252- # choco install visualstudio2019buildtools
250+ choco install visualstudio2019community --package-parameters "--includeRecommended"
251+ choco install visualstudio2019buildtools
253252 # choco install visualstudio2019-workload-nativedesktop
254253 choco install visualstudio2019-workload-vctools
255- # choco install jom
256254 - name : Build for debug mode
257255 shell : cmd
258256 run : |
@@ -261,51 +259,232 @@ jobs:
261259 where nmake
262260 set CL=/MP
263261 qmake -version
264- .\ configure.bat --enable-debug
262+ call configure.bat --enable-debug
265263 cd src
266264 nmake
267265 nmake install
268266 cd ..\tools
269267 nmake
270268 nmake install
271269 cd test
272- testall.bat
270+ call testall.bat
273271 - name : Build for release mode
274272 shell : cmd
275273 run : |
276274 call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
277275 set CL=/MP
278- .\ configure.bat
276+ call configure.bat
279277 cd src
280278 nmake
281279 nmake install
282280 cd ..\tools
283281 nmake
284282 nmake install
285- tools\releasetest\releasetest.bat
286-
283+ call tools\releasetest\releasetest.bat
284+ - name: Install VisualStudio tools
285+ run: |
286+ choco install visualstudio2019community
287+ choco install visualstudio2019buildtools
288+ # choco install visualstudio2019-workload-nativedesktop
289+ choco install visualstudio2019-workload-vctools
290+ - name : Build for debug mode
291+ shell : cmd
292+ run : |
293+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
294+ where cl
295+ where nmake
296+ set CL=/MP
297+ qmake -version
298+ call configure.bat --enable-debug
299+ cd src
300+ nmake
301+ nmake install
302+ cd ..\tools
303+ nmake
304+ nmake install
305+ cd test
306+ call testall.bat
307+ - name : Build for release mode
308+ shell : cmd
309+ run : |
310+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
311+ set CL=/MP
312+ call configure.bat
313+ cd src
314+ nmake
315+ nmake install
316+ cd ..\tools
317+ nmake
318+ nmake install
319+ call tools\releasetest\releasetest.bat
287320
288- # build-windows-msvc2019-qt65:
289- # runs-on: windows-latest
290- # steps:
291- # - uses: actions/checkout@main
292- # - name: Install Qt
293- # uses: jurplel/install-qt-action@latest
294- # with:
295- # version: '6.5.2'
296- # host: 'windows'
297- # target: 'desktop'
298321
299- # choco install visualstudio2019buildtools --params "--add Microsoft.VisualStudio.Workload.VCTools"
300- # refreshenv
322+ build-windows-msvc2019-qt65 :
323+ runs-on : windows-latest
324+ steps :
325+ - uses : actions/checkout@main
326+ - name : Install Qt
327+ uses : jurplel/install-qt-action@v4
328+ with :
329+ version : ' 6.5.2'
330+ host : ' windows'
331+ target : ' desktop'
332+ - name : Install VisualStudio tools
333+ run : |
334+ # choco install visualstudio2019community
335+ choco install visualstudio2019buildtools
336+ choco install visualstudio2019-workload-nativedesktop
337+ choco install visualstudio2019-workload-vctools
338+ # choco install jom
339+ - name : Build for debug mode
340+ shell : cmd
341+ run : |
342+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
343+ where cl
344+ where nmake
345+ set CL=/MP
346+ qmake -version
347+ call configure.bat --enable-debug
348+ cd src
349+ nmake
350+ nmake install
351+ cd ..\tools
352+ nmake
353+ nmake install
354+ cd test
355+ call testall.bat
356+ - name : Build for release mode
357+ shell : cmd
358+ run : |
359+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
360+ set CL=/MP
361+ call configure.bat
362+ cd src
363+ nmake
364+ nmake install
365+ cd ..\tools
366+ nmake
367+ nmake install
368+ call tools\releasetest\releasetest.bat
369+ - name: Install VisualStudio tools
370+ run: |
371+ choco install visualstudio2019community --package-parameters "--includeRecommended"
372+ # choco install visualstudio2019buildtools
373+ # choco install visualstudio2019-workload-nativedesktop
374+ choco install visualstudio2019-workload-vctools
375+ # choco install jom
376+ - name : Build for debug mode
377+ shell : cmd
378+ run : |
379+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
380+ where cl
381+ where nmake
382+ set CL=/MP
383+ qmake -version
384+ call configure.bat --enable-debug
385+ cd src
386+ nmake
387+ nmake install
388+ cd ..\tools
389+ nmake
390+ nmake install
391+ cd test
392+ call testall.bat
393+ - name : Build for release mode
394+ shell : cmd
395+ run : |
396+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
397+ set CL=/MP
398+ call configure.bat
399+ cd src
400+ nmake
401+ nmake install
402+ cd ..\tools
403+ nmake
404+ nmake install
405+ call tools\releasetest\releasetest.bat
301406
302- # build-windows-msvc2019-qt62:
303- # runs-on: windows-latest
304- # steps:
305- # - uses: actions/checkout@main
306- # - name: Install Qt
307- # uses: jurplel/install-qt-action@latest
308- # with:
309- # version: '6.2.7'
310- # host: 'windows'
311- # target: 'desktop'
407+ build-windows-msvc2019-qt62 :
408+ runs-on : windows-latest
409+ steps :
410+ - uses : actions/checkout@main
411+ - name : Install Qt
412+ uses : jurplel/install-qt-action@v4
413+ with :
414+ version : ' 6.2.7'
415+ host : ' windows'
416+ target : ' desktop'
417+ - name : Install VisualStudio tools
418+ run : |
419+ choco install visualstudio2019community --package-parameters "--includeRecommended --includeOptional"
420+ choco install visualstudio2019buildtools
421+ # choco install visualstudio2019-workload-nativedesktop
422+ choco install visualstudio2019-workload-vctools
423+ choco install jom
424+ - name : Build for debug mode
425+ shell : cmd
426+ run : |
427+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
428+ where cl
429+ where nmake
430+ set CL=/MP
431+ qmake -version
432+ call configure.bat --enable-debug
433+ cd src
434+ nmake
435+ nmake install
436+ cd ..\tools
437+ nmake
438+ nmake install
439+ cd test
440+ call testall.bat
441+ - name : Build for release mode
442+ shell : cmd
443+ run : |
444+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
445+ set CL=/MP
446+ call configure.bat
447+ cd src
448+ nmake
449+ nmake install
450+ cd ..\tools
451+ nmake
452+ nmake install
453+ call tools\releasetest\releasetest.bat
454+ - name: Install VisualStudio tools
455+ run: |
456+ choco install visualstudio2019community --package-parameters "--includeRecommended"
457+ # choco install visualstudio2019buildtools
458+ # choco install visualstudio2019-workload-nativedesktop
459+ choco install visualstudio2019-workload-vctools
460+ # choco install jom
461+ - name : Build for debug mode
462+ shell : cmd
463+ run : |
464+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
465+ where cl
466+ where nmake
467+ set CL=/MP
468+ qmake -version
469+ call configure.bat --enable-debug
470+ cd src
471+ nmake
472+ nmake install
473+ cd ..\tools
474+ nmake
475+ nmake install
476+ cd test
477+ call testall.bat
478+ - name : Build for release mode
479+ shell : cmd
480+ run : |
481+ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
482+ set CL=/MP
483+ call configure.bat
484+ cd src
485+ nmake
486+ nmake install
487+ cd ..\tools
488+ nmake
489+ nmake install
490+ call tools\releasetest\releasetest.bat
0 commit comments