aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-10-26 10:19:45 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-10-29 14:57:32 +0000
commit91c20d709a55c22ba265fd95865982d9c2482cbf (patch)
treece97cad891d93db82943d8411d576de5cc748dc2
parent5bffe4c68838ab1b253df80fdefc0e1a395bd8fb (diff)
Provisioning: Change cache url suffix ci.local to intra.qt.io
Change-Id: Ifaa84ddb6b8b3bdbada2a7af26df92e151792532 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit ba32df291c8de21aa0443c6b8f4c812401161dc0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/common/linux/integrity.sh4
-rwxr-xr-xcoin/provisioning/common/macos/ninja.sh4
-rwxr-xr-xcoin/provisioning/common/macos/nodejs.sh2
-rw-r--r--coin/provisioning/common/windows/install-protobuf.ps14
-rw-r--r--coin/provisioning/common/windows/install-stm32cubeprogrammer.ps14
5 files changed, 9 insertions, 9 deletions
diff --git a/coin/provisioning/common/linux/integrity.sh b/coin/provisioning/common/linux/integrity.sh
index a90145ff..8584fe3c 100755
--- a/coin/provisioning/common/linux/integrity.sh
+++ b/coin/provisioning/common/linux/integrity.sh
@@ -42,8 +42,8 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
-urlLibeglmegapack="http://ci-files01-hki.ci.local/input/integrity/integrity_libeglmegapack.zip"
+urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_patched.zip"
+urlLibeglmegapack="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_libeglmegapack.zip"
SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
targetFolder="$HOME"
diff --git a/coin/provisioning/common/macos/ninja.sh b/coin/provisioning/common/macos/ninja.sh
index 203ef953..a17d341c 100755
--- a/coin/provisioning/common/macos/ninja.sh
+++ b/coin/provisioning/common/macos/ninja.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,7 +39,7 @@
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
version="1.10.2"
-internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/mac/ninja-mac_v${version}.zip"
externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
SHA1="95d0ca5e7c67ab7181c87e6a6ec59d11b1ff2d30"
DestDir="/usr/local/bin/"
diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh
index 1313d27e..81e29c90 100755
--- a/coin/provisioning/common/macos/nodejs.sh
+++ b/coin/provisioning/common/macos/nodejs.sh
@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# This script will install Nodejs
version="14.16.1"
-urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg"
+urlCache="http://ci-files01-hki.intra.qt.io/input/nodejs/node-v$version.pkg"
urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
diff --git a/coin/provisioning/common/windows/install-protobuf.ps1 b/coin/provisioning/common/windows/install-protobuf.ps1
index 84c04cdd..6f563264 100644
--- a/coin/provisioning/common/windows/install-protobuf.ps1
+++ b/coin/provisioning/common/windows/install-protobuf.ps1
@@ -1,6 +1,6 @@
#############################################################################
##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,7 +38,7 @@
$version = "3.6.1"
$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
-$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
+$cachedUrl = "http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
$zip = "C:\Utils\protobuf-all-$version.zip"
$installationFolder = "C:\Utils\protobuf"
diff --git a/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 b/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1
index a5eba038..a5418f26 100644
--- a/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1
+++ b/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,7 +37,7 @@
# Official donwload from https://www.st.com/en/development-tools/stm32cubeprog.html
$version ="2_5_0"
-$url = "http://ci-files01-hki.ci.local/input/windows/STMicroelectronics_v${version}.zip"
+$url = "http://ci-files01-hki.intra.qt.io/input/windows/STMicroelectronics_v${version}.zip"
$zip = "C:\Windows\Temp\STMicroelectronics_v${version}.zip"
Download $url $url $zip