Skip to content

Commit c1a8b82

Browse files
committed
Merge #1526: ci: fix windows jobs for 23.x
75bd182 ci(windows): pin jom to 1.1.2 (Byron Hambly) aad3baf ci: update qt link for windows job (Byron Hambly) Pull request description: copy of #1520 for elements-23.x ACKs for top commit: delta1: ACK [75bd182](75bd182); CI changes only and CI passed successfully Tree-SHA512: 237f4aea13f36da5840fcb34a04ee8fc08dceb8e841fb13b7bbe61885d35661ea95e3228a996634f0a75f481a1cf36a5131404c9033ddab52c37c333385d6994
2 parents 166bc34 + 75bd182 commit c1a8b82

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ win64_native_common: &win64_native_common
9494
CI_VCPKG_TAG: '2021.05.12'
9595
VCPKG_DOWNLOADS: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\downloads'
9696
VCPKG_DEFAULT_BINARY_CACHE: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
97-
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
97+
QT_DOWNLOAD_URL: 'https://download.qt.io/archive/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
9898
QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.3.zip'
9999
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.3'
100100
QTBASEDIR: 'C:\Qt_static'
@@ -116,7 +116,7 @@ win64_native_common: &win64_native_common
116116
- echo %QT_DOWNLOAD_URL%
117117
- msbuild -version
118118
populate_script:
119-
- curl -L -o C:\jom.zip http://download.qt.io/official_releases/jom/jom.zip
119+
- curl -L -o C:\jom.zip https://download.qt.io/official_releases/jom/jom_1_1_2.zip
120120
- mkdir C:\jom
121121
- tar -xf C:\jom.zip -C C:\jom
122122
- curl -L -o %QT_LOCAL_PATH% %QT_DOWNLOAD_URL%

0 commit comments

Comments
 (0)