@@ -45,26 +45,26 @@ jobs:
4545 config :
4646 - name : " Windows Intel 64bit"
4747 artifact : " Windows-x64"
48- runs-on : windows-2019
48+ runs-on : windows-2022
4949 os : windows
5050 qt_host : ' windows'
5151 qt_version : ' 6.8.0'
52- qt_arch : ' win64_msvc2019_64 '
53- qt_dir : " msvc2019_64 "
54- environment_script : " C:/Program Files (x86)/Microsoft Visual Studio/2019 /Enterprise/VC/Auxiliary/Build/vcvars64.bat"
52+ qt_arch : ' win64_msvc2022_64 '
53+ qt_dir : " msvc2022_64 "
54+ environment_script : " C:/Program Files (x86)/Microsoft Visual Studio/2022 /Enterprise/VC/Auxiliary/Build/vcvars64.bat"
5555 cmake_extra_config : ' -DSENTRY=ON'
5656
5757 - name : " Windows ARM 64bit"
5858 artifact : " Windows-ARM64"
59- runs-on : windows-2019
59+ runs-on : windows-2022
6060 os : windows
6161 qt_host : ' windows'
62- qt_host_arch : ' win64_msvc2019_64 '
62+ qt_host_arch : ' win64_msvc2022_64 '
6363 qt_version : ' 6.8.0'
64- qt_arch : ' win64_msvc2019_arm64 '
65- qt_dir : " msvc2019_arm64 "
66- environment_script : " C:/Program Files (x86)/Microsoft Visual Studio/2019 /Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
67- cmake_extra_config : ' -DCMAKE_TOOLCHAIN_FILE=%Qt6_DIR%/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=%Qt6_DIR%/../msvc2019_64 '
64+ qt_arch : ' win64_msvc2022_arm64_cross_compiled '
65+ qt_dir : " msvc2022_arm64 "
66+ environment_script : " C:/Program Files (x86)/Microsoft Visual Studio/2022 /Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
67+ cmake_extra_config : ' -DCMAKE_TOOLCHAIN_FILE=%Qt6_DIR%/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=%Qt6_DIR%/../msvc2022_64 '
6868
6969 - name : " Ubuntu 22.04"
7070 artifact : " Ubuntu-22.04"
@@ -144,7 +144,7 @@ jobs:
144144 qt_host : ' linux'
145145 qt_host_arch : ' linux_gcc_64'
146146 qt_target : ' android'
147- qt_version : ' 6.8.0 '
147+ qt_version : ' 6.7.3 '
148148 qt_arch : ' android_x86_64'
149149 qt_extra_archs : ' android_arm64_v8a android_armv7 android_x86'
150150 cmake_extra_config : ' -DSENTRY=ON'
@@ -156,7 +156,7 @@ jobs:
156156 qt_host : ' mac'
157157 qt_host_arch : ' clang_64'
158158 qt_target : ' ios'
159- qt_version : ' 6.8.0 '
159+ qt_version : ' 6.7.3 '
160160 qt_arch : ' ios'
161161 cmake_extra_config : ' '
162162 xcode : ' 15.2'
@@ -223,13 +223,13 @@ jobs:
223223 echo "Qt6_DIR=$Qt6_DIR" >> $GITHUB_ENV
224224
225225 # Fix broken Windows / ARM64 setup
226- if [ "${{ matrix.config.qt_arch }}" = "win64_msvc2019_arm64 " ]; then
226+ if [ "${{ matrix.config.qt_arch }}" = "win64_msvc2022_arm64 " ]; then
227227 # Qt < 6.5.0
228- sed -i "s,/Users/qt/work/install/,`echo -E ${Qt6_DIR} | tr '\\' '/'`/../msvc2019_64 /," "${Qt6_DIR}/bin/qtpaths.bat"
229- sed -i "s,/Users/qt/work/install/,`echo -E ${Qt6_DIR} | tr '\\' '/'`/../msvc2019_64 /," "${Qt6_DIR}/bin/qmake.bat"
228+ sed -i "s,/Users/qt/work/install/,`echo -E ${Qt6_DIR} | tr '\\' '/'`/../msvc2022_64 /," "${Qt6_DIR}/bin/qtpaths.bat"
229+ sed -i "s,/Users/qt/work/install/,`echo -E ${Qt6_DIR} | tr '\\' '/'`/../msvc2022_64 /," "${Qt6_DIR}/bin/qmake.bat"
230230 # Qt >= 6.5.0
231- sed -i "s,\\\Users\\\qt\\\work\\\install\\\,`echo -E ${Qt6_DIR} | sed -e 's,\\\,\\\\\\\,g'`\\\..\\\msvc2019_64 \\\," "${Qt6_DIR}/bin/qtpaths.bat"
232- sed -i "s,\\\Users\\\qt\\\work\\\install\\\,`echo -E ${Qt6_DIR} | sed -e 's,\\\,\\\\\\\,g'`\\\..\\\msvc2019_64 \\\," "${Qt6_DIR}/bin/qmake.bat"
231+ sed -i "s,\\\Users\\\qt\\\work\\\install\\\,`echo -E ${Qt6_DIR} | sed -e 's,\\\,\\\\\\\,g'`\\\..\\\msvc2022_64 \\\," "${Qt6_DIR}/bin/qtpaths.bat"
232+ sed -i "s,\\\Users\\\qt\\\work\\\install\\\,`echo -E ${Qt6_DIR} | sed -e 's,\\\,\\\\\\\,g'`\\\..\\\msvc2022_64 \\\," "${Qt6_DIR}/bin/qmake.bat"
233233 ${Qt6_DIR}/bin/qmake.bat -query
234234 fi
235235
0 commit comments