From b3d10251b4225e9d1840437003269537c66cc183 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Fri, 25 Aug 2023 16:21:13 +0300 Subject: [PATCH] Fix cache URLs and add missing cache files The missing files were downloaded from their external source and placed in their directories of the cache URLs. Files: FFmpeg-n6.0.tar.gz, Postgres-2.5-14.dmg, protobuf-all-21.9.zip, MimerSQLInstaller_x64_1107b.exe, FFmpeg-n6.0.zip, msys2-base-x86_64-20220319.tar.xz, python-3.10.0-amd64.exe, python-2.7.13.msi, mimersqlsrv_11.0_amd64-openssl3.deb, mimersqlsrv-11.0.x86_64-openssl3.rpm, MinGW-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev3.7z Task-number: QTQAINFRA-5766 Change-Id: Ieacdc9138b71969397d900096956f54faff45918 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-ffmpeg.ps1 | 2 +- coin/provisioning/common/windows/install-mingw.ps1 | 2 +- coin/provisioning/common/windows/install-msys2.ps1 | 2 +- coin/provisioning/common/windows/install-sevenzip.ps1 | 2 +- coin/provisioning/common/windows/mimersql.ps1 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index c83d06d0..f7cd217c 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -10,7 +10,7 @@ $version = "n6.0" $ffmpeg_name = "ffmpeg-" + $version; $sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7" -$url_cached = "http://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip" +$url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip" $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip" $download_location = "C:\Windows\Temp\" + $ffmpeg_name + ".zip" $unzip_location = "C:\" diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 76154f46..bf64e460 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -18,7 +18,7 @@ function InstallMinGW $targetdir = "C:\$envvar" $url_original = "https://github.com/cristianadam/mingw-builds/releases/download/v" + $version + "-" + $revision + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" - $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\" + $release + ".7z" + $url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/" + $release + ".7z" $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" Download $url_original $url_cache $mingwPackage Verify-Checksum $mingwPackage $sha1 diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 79371a07..fef64e14 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -16,7 +16,7 @@ $package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" $url_cache_prebuilt = "\\ci-files01-hki.ci.qt.io\provisioning\windows\$package_prebuilt" -$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\$package" +$url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package" $TargetLocation = "C:\Utils" diff --git a/coin/provisioning/common/windows/install-sevenzip.ps1 b/coin/provisioning/common/windows/install-sevenzip.ps1 index e43d51a8..a0d44390 100644 --- a/coin/provisioning/common/windows/install-sevenzip.ps1 +++ b/coin/provisioning/common/windows/install-sevenzip.ps1 @@ -16,7 +16,7 @@ if (Is64BitWinHost) { $sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C" } -$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\7z" + $nonDottedVersion + $arch + ".exe" +$url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/7z" + $nonDottedVersion + $arch + ".exe" $url_official = "http://www.7-zip.org/a/7z" + $nonDottedVersion + $arch + ".exe" $7zPackage = "C:\Windows\Temp\7zip-$nonDottedVersion.exe" $7zTargetLocation = "C:\Utils\sevenzip\" diff --git a/coin/provisioning/common/windows/mimersql.ps1 b/coin/provisioning/common/windows/mimersql.ps1 index 1f4660e6..b5e041d0 100644 --- a/coin/provisioning/common/windows/mimersql.ps1 +++ b/coin/provisioning/common/windows/mimersql.ps1 @@ -8,7 +8,7 @@ $version = "1107b" -$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\MimerSQLInstaller_x64_" + $version + ".exe" +$url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/MimerSQLInstaller_x64_" + $version + ".exe" $url_official = "https://install.mimer.com/qt/windows_" + $version + "/MimerSQLInstaller_x64.exe" $mimersqlPackage = "C:\Windows\Temp\MimerSQLInstaller_x64_" + $version + ".exe" $sha1 = "A709A06EA1D897B13FA10DBDD4BE3BD0FEB04B28"