Skip to content

Commit 04b4a76

Browse files
committed
fix vs
1 parent bf1a682 commit 04b4a76

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/ci-win.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
- name: "Build on Win64 Qt 5.15"
3232
arch: win64_msvc2019_64
3333
vs_version: 2019
34+
vs_cmd: "C:\\Program Files (x86)\\Microsoft Visual Studio\\${{matrix.config.vs_version}}\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
3435
qt: 5.15.2
3536
qt_modules: qtwebengine
3637
qt_tools: tools_opensslv3_x64
@@ -39,6 +40,7 @@ jobs:
3940
- name: "Build on Win64 Qt 6"
4041
arch: win64_msvc2022_64
4142
vs_version: 2022
43+
vs_cmd: "C:\\Program Files\\Microsoft Visual Studio\\${{matrix.config.vs_version}}\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
4244
qt: 6.8.3
4345
qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
4446
qt_tools: tools_opensslv3_x64
@@ -96,7 +98,7 @@ jobs:
9698
shell: cmd
9799
run: |
98100
cmake --version
99-
call "C:\Program Files (x86)\Microsoft Visual Studio\${{matrix.config.vs_version}}\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
101+
call "${{matrix.config.vs_cmd}}"
100102
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
101103
cmake --build .
102104
cmake --build . --target=pack

0 commit comments

Comments
 (0)