diff options
| author | Ville-Pekka Karhu <ville-pekka.karhu@qt.io> | 2021-12-17 16:31:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-19 19:47:21 +0000 |
| commit | dceadf3e761591df89851c75b2cc40db6ebe6f89 (patch) | |
| tree | 596f4b5015d8b374dc1b88807b1ca97ebe9243eb | |
| parent | eb018be96ea054383607ba5ecf1b0297fede364a (diff) | |
macOS: Upgrade Xcode to 13.2
Task-number: QTQAINFRA-4607
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit fe35c4dbb0e4b3a590be8a1426b482bfefbfbc5a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
6 files changed, 9 insertions, 12 deletions
diff --git a/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh b/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh index a58e6607..7087076f 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/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/Xcode_12.5.1.xip 12.5.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2 diff --git a/coin/provisioning/qtci-macos-11.0-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11.0-arm/21-install-commandlinetools.sh index aa65b15f..946ecc53 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/21-install-commandlinetools.sh @@ -37,10 +37,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="12.5.1" +version="13.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517" +sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252" InstallCommandLineTools $url $url $sha1 $packageName $version - diff --git a/coin/provisioning/qtci-macos-12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-12-x86_64/20-xcode.sh index b03bb012..7087076f 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-12-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/Xcode_13.1.xip 13.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2 diff --git a/coin/provisioning/qtci-macos-12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-12-x86_64/21-install-commandlinetools.sh index 1f73b202..946ecc53 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="13.1" +version="13.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="fe70c0ca223a7ef8a9a53bd4529361fa0fed9eed" +sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252" InstallCommandLineTools $url $url $sha1 $packageName $version - diff --git a/coin/provisioning/qtci-macos-12.0-arm/20-xcode.sh b/coin/provisioning/qtci-macos-12.0-arm/20-xcode.sh index 1c1dbab8..7087076f 100755 --- a/coin/provisioning/qtci-macos-12.0-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-12.0-arm/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/Xcode_13.1_Release_Candidate.xip 13.1_RC +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2 diff --git a/coin/provisioning/qtci-macos-12.0-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-12.0-arm/21-install-commandlinetools.sh index 1cf68a32..946ecc53 100755 --- a/coin/provisioning/qtci-macos-12.0-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-12.0-arm/21-install-commandlinetools.sh @@ -37,10 +37,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="13.1_Release_Candidate" +version="13.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="fe70c0ca223a7ef8a9a53bd4529361fa0fed9eed" +sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252" InstallCommandLineTools $url $url $sha1 $packageName $version - |