From 922b5f48b6a8afdd3c2dbefa0ca9987f83f9d27a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 8 Nov 2021 11:46:40 +0200 Subject: [PATCH] Upgrade Xcode and Command Line Tools version to 13.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xcode 13.2 works only in macOS 11.3/12.0 or newer Task-number: QTQAINFRA-4607 Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b Reviewed-by: Tor Arne Vestbø (cherry picked from commit 72997d7039f5ce77fc5eca06152d38f70510bde4) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh | 2 +- .../qtci-macos-11-x86_64/21-install-commandlinetools.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh index 88ba7f36..878ce325 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh @@ -56,4 +56,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-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh index 7e1152d1..c50c1406 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh @@ -43,10 +43,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 -