diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-03-23 09:07:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-26 17:15:49 +0000 |
| commit | 3a49fa3b969c67ac163fab53d2ba672d352b95ab (patch) | |
| tree | bcd95d0556ff6f9d5976a5532eec1db600832bb6 | |
| parent | 1391b297e1f85e322610a235e1a37446ff1b7448 (diff) | |
Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0
Task-number: QTQAINFRA-4230
Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7a027b4dfdf4baa65ebb07f748849aa47d5079b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
4 files changed, 8 insertions, 8 deletions
diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh index f2014388..270d894a 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.3.xip 12.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4 diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh index f13f7bae..ad047d1b 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.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. @@ -37,10 +37,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="12.3" +version="12.4" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName" -sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9" +sha1="eabb32d167da029dfc70af94de2bf61abd416ca1" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh index f2014388..270d894a 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.3.xip 12.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4 diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh index f13f7bae..ad047d1b 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.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. @@ -37,10 +37,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="12.3" +version="12.4" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName" -sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9" +sha1="eabb32d167da029dfc70af94de2bf61abd416ca1" InstallCommandLineTools $url $url $sha1 $packageName $version |