Skip to content

Commit eafa7ce

Browse files
udpated actions.
1 parent 8767c3b commit eafa7ce

1 file changed

Lines changed: 19 additions & 20 deletions

File tree

.github/workflows/actions.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -314,15 +314,11 @@ jobs:
314314
run: |
315315
./testall.sh
316316
317-
build-windows-qt68-msvc2022:
318-
runs-on: windows-latest
317+
build-windows-qt68-msvc2026:
318+
runs-on: windows-2025-vs2026
319319
steps:
320-
- uses: actions/checkout@main
321-
- name: Setup msbuild
322-
uses: microsoft/setup-msbuild@v2
323-
with:
324-
vs-version: '[17,18)' # 17.xx
325-
msbuild-architecture: x64
320+
- name: Checkout repository
321+
uses: actions/checkout@main
326322
- name: Install Qt
327323
uses: jurplel/install-qt-action@v4
328324
with:
@@ -333,11 +329,10 @@ jobs:
333329
- name: Install tools
334330
run: |
335331
choco install sqlite -y --no-progress
336-
choco install cmake -y --version=3.31.7 --no-progress
337332
- name: Debug build
338333
shell: cmd
339334
run: |
340-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
335+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
341336
set CL=/MP
342337
qmake -version
343338
call configure.bat --enable-debug
@@ -355,7 +350,7 @@ jobs:
355350
- name: Release build
356351
shell: cmd
357352
run: |
358-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
353+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
359354
set CL=/MP
360355
call configure.bat
361356
cd src
@@ -370,27 +365,31 @@ jobs:
370365
run: |
371366
testall.bat
372367
373-
build-windows-qt68-msvc2019:
374-
runs-on: windows-latest
368+
build-windows-qt68-msvc2022:
369+
runs-on: windows-2022
375370
steps:
376371
- uses: actions/checkout@main
372+
- name: Checkout msbuild
373+
id: checkout_msbuild
374+
uses: microsoft/setup-msbuild@v2
375+
with:
376+
vs-version: '[17,18)' # 17.xx
377+
msbuild-architecture: x64
377378
- name: Install Qt
378379
uses: jurplel/install-qt-action@v4
379380
with:
380381
version: 6.8
381382
host: windows
382383
target: desktop
383384
setup-python: false
384-
- name: Install VisualStudio tools
385+
- name: Install tools
385386
run: |
386-
choco install visualstudio2019community -y --no-progress
387-
choco install visualstudio2019-workload-nativedesktop -y --no-progress
388387
choco install sqlite -y --no-progress
389-
choco install cmake -y --version=3.31.7 --no-progress
388+
#choco install cmake -y --version=3.31.7 --no-progress
390389
- name: Debug build
391390
shell: cmd
392391
run: |
393-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
392+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
394393
set CL=/MP
395394
qmake -version
396395
call configure.bat --enable-debug
@@ -408,7 +407,7 @@ jobs:
408407
- name: Release build
409408
shell: cmd
410409
run: |
411-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
410+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
412411
set CL=/MP
413412
call configure.bat
414413
cd src
@@ -424,7 +423,7 @@ jobs:
424423
testall.bat
425424
426425
build-windows-qt65-msvc2019:
427-
runs-on: windows-latest
426+
runs-on: windows-2022
428427
steps:
429428
- uses: actions/checkout@main
430429
- name: Install Qt

0 commit comments

Comments
 (0)