File tree Expand file tree Collapse file tree 2 files changed +17
-11
lines changed
Expand file tree Collapse file tree 2 files changed +17
-11
lines changed Original file line number Diff line number Diff line change @@ -95,27 +95,33 @@ jobs:
9595 - {
9696 name : " Windows 2022 MSVC" ,
9797 artifact : " Windows-MSVC.tar.xz" ,
98- os : windows-2025 ,
98+ os : windows-2022 ,
9999 cc : " cl" , cxx: "cl",
100100 environment_script : " C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
101101 }
102102
103103 steps :
104104 - uses : actions/checkout@v4
105105
106+ - name : Fix Python path
107+ shell : pwsh
108+ run : |
109+ Remove-Item "$env:LOCALAPPDATA\Microsoft\WindowsApps\python*.exe" -Force -ErrorAction SilentlyContinue
110+
106111 - name : Cache Qt
107112 id : cache-qt
108- uses : actions/cache@v3
113+ uses : actions/cache@v4
109114 with :
110- path : ./build/Qt
111- key : ${{ runner.os }}-QtCache
115+ path : ./build/Qt/6.9.1
116+ key : ${{ runner.os }}-QtCache-6.9.1
112117
113118 - name : Install Qt
114119 uses : jurplel/install-qt-action@v4
115120 with :
116- version : 6.8.*
121+ version : 6.9.1
117122 target : desktop
118123 dir : ' ${{ github.workspace }}/build/'
124+ cached : ${{ steps.cache-qt.outputs.cache-hit }}
119125
120126 - name : Configure
121127 working-directory : build
Original file line number Diff line number Diff line change 11image :
2- - Visual Studio 2019
2+ - Visual Studio 2022
33clone_folder : c:\projects\source
44
55environment :
6- Qt5_INSTALL_DIR : ' C:\Qt\5.15.2\msvc2019_64 '
7- PATH : ' %Qt5_INSTALL_DIR %\bin;%PATH%'
6+ Qt6_INSTALL_DIR : ' C:\Qt\6.8.1\msvc2022_64 '
7+ PATH : ' %Qt6_INSTALL_DIR %\bin;%PATH%'
88
99build_script :
1010- cmd : >-
1111
12- set QTDIR=%Qt5_INSTALL_DIR %
12+ set QTDIR=%Qt6_INSTALL_DIR %
1313
14- set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019 \Community\VC"
14+ set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2022 \Community\VC"
1515
1616 set "OPENSSL_ROOT_DIR=C:/OpenSSL-v111-Win64"
1717
18- cmake -S c:\projects\source -B build -G "Visual Studio 16 2019 " -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF
18+ cmake -S c:\projects\source -B build -G "Visual Studio 17 2022 " -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF
1919
2020 cmake --build build --parallel 2 --config "Release"
2121
You can’t perform that action at this time.
0 commit comments