Skip to content

Commit 1cf1e31

Browse files
update
1 parent b997f18 commit 1cf1e31

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

.github/workflows/actions.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
- name: Setup msbuild
198198
uses: microsoft/setup-msbuild@v2
199199
with:
200-
vs-version: 17.12
200+
vs-version: '[17,18)' # 17.xx
201201
msbuild-architecture: x64
202202
- name: Install Qt
203203
uses: jurplel/install-qt-action@v4
@@ -250,27 +250,25 @@ jobs:
250250
steps:
251251
- uses: actions/checkout@main
252252
- name: Setup msbuild
253-
uses: microsoft/[email protected]
253+
uses: microsoft/setup-msbuild@v2
254+
with:
255+
vs-version: '[16,17)' # 16.xx
256+
msbuild-architecture: x86
257+
- name: Install Qt
258+
uses: jurplel/install-qt-action@v4
254259
with:
255-
vs-version: '[16.4,16.5)'
256-
# msbuild-architecture: x64
257-
# - name: Install Qt
258-
# uses: jurplel/install-qt-action@v4
259-
# with:
260-
# version: 6.8
261-
# host: windows
262-
# target: desktop
263-
# setup-python: false
264-
# - name: Install tools
265-
# run: |
266-
# choco install sqlite -y
267-
# choco install cmake -y
260+
version: 6.8
261+
host: windows
262+
target: desktop
263+
setup-python: false
264+
- name: Install tools
265+
run: |
266+
choco install sqlite -y
267+
choco install cmake -y
268268
- name: Debug build
269269
shell: cmd
270270
run: |
271-
"C:\ProgramData\Chocolatey\bin\vswhere.exe" --find **\vcvarsall.bat
272-
dir "C:\Program Files (x86)\Microsoft Visual Studio"
273-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
271+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
274272
set CL=/MP
275273
cl 2>&1
276274
qmake -version
@@ -308,10 +306,10 @@ jobs:
308306
steps:
309307
- uses: actions/checkout@main
310308
- name: Setup msbuild
311-
uses: microsoft/setup-msbuild@v1
309+
uses: microsoft/setup-msbuild@v2
312310
with:
313-
vs-version: 16.11
314-
msbuild-architecture: x64
311+
vs-version: '[16,17)' # 16.xx
312+
msbuild-architecture: x86
315313
- name: Install Qt
316314
uses: jurplel/install-qt-action@v4
317315
with:

0 commit comments

Comments
 (0)