From 6ddb97c90e63854fa4a283cdc4dd2f5d30ff08d9 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 2 Nov 2023 09:36:51 +0200 Subject: [PATCH] Provisioning: Fix icu 73.2 Icu packages overwritten in ci-files01-hki, and file hash changed. Change-Id: I4755e13409cd4af008919ae3905fdb21fb893795 Reviewed-by: Jani Heikkinen --- .../qtci-linux-RHEL-8.6-x86_64/30-install_icu.sh | 2 +- .../qtci-linux-RHEL-8.8-x86_64/30-install_icu.sh | 2 +- .../qtci-linux-RHEL-9.2-x86_64/30-install_icu.sh | 6 +++--- .../qtci-linux-Ubuntu-22.04-x86_64/30-install_icu.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/30-install_icu.sh index 7fb5b704..0effaefa 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/30-install_icu.sh @@ -12,7 +12,7 @@ set -ex icuVersion="73.2" icuLocation="/usr/lib64" -sha1="78332b78ce8d7c42a41a30e0293171885d632b39" +sha1="d2bbb7b2a9a9ee00dba5cc6a68137f6c8a98c27e" baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/30-install_icu.sh index 7fb5b704..0effaefa 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/30-install_icu.sh @@ -12,7 +12,7 @@ set -ex icuVersion="73.2" icuLocation="/usr/lib64" -sha1="78332b78ce8d7c42a41a30e0293171885d632b39" +sha1="d2bbb7b2a9a9ee00dba5cc6a68137f6c8a98c27e" baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/30-install_icu.sh index ed5640bc..8d365c9d 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/30-install_icu.sh @@ -11,12 +11,12 @@ set -ex icuVersion="73.2" icuLocation="/usr/lib64" -sha1="78332b78ce8d7c42a41a30e0293171885d632b39" -baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" +sha1="d2bbb7b2a9a9ee00dba5cc6a68137f6c8a98c27e" +baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" sha1Dev="edc9cba31ffeac28bf7360c52b85b5e4d2f39043" -develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" +develPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/30-install_icu.sh index baf5ced9..260dc55a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/30-install_icu.sh @@ -12,7 +12,7 @@ set -ex icuVersion="73.2" icuLocationLib="/opt/icu/lib64" icuLocationInclude="/opt/icu/include" -sha1="cb00d9594eea82e7164e3c2311307ad364e19ce8" +sha1="5699987afcceb0390e52fb860bb3b4ab8b39cabe" baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu22.04-x64.7z" baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu22.04-x64.7z"