From eb0dd02a4a35a1c18b8df68cd0e5a4b59bdbbb3a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 16 Dec 2022 09:43:30 +0000 Subject: [PATCH] Provisioning: Upgrade Xcode version to 14.2 for macOS 12 & 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change also upgrades command line tools Pick-to: 6.4 6.2 5.15 Change-Id: I6cdceba07dcecf5b0be394dc147c16e084800763 Reviewed-by: Ville-Pekka Karhu Reviewed-by: Qt CI Bot Reviewed-by: Tor Arne Vestbø --- coin/provisioning/qtci-macos-12-arm/20-xcode.sh | 2 +- .../qtci-macos-12-arm/21-install-commandlinetools.sh | 4 ++-- coin/provisioning/qtci-macos-12-x86_64/20-xcode.sh | 2 +- .../qtci-macos-12-x86_64/21-install-commandlinetools.sh | 4 ++-- coin/provisioning/qtci-macos-13-arm/20-xcode.sh | 2 +- .../qtci-macos-13-arm/21-install-commandlinetools.sh | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/qtci-macos-12-arm/20-xcode.sh b/coin/provisioning/qtci-macos-12-arm/20-xcode.sh index 6ee0fa42..a062b6e2 100755 --- a/coin/provisioning/qtci-macos-12-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-12-arm/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_14.1.xip 14.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2 diff --git a/coin/provisioning/qtci-macos-12-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-12-arm/21-install-commandlinetools.sh index f73c57eb..3777e52f 100755 --- a/coin/provisioning/qtci-macos-12-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-12-arm/21-install-commandlinetools.sh @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="14.1" +version="14.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450" +sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6" 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 6ee0fa42..a062b6e2 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-12-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_14.1.xip 14.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.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 f73c57eb..3777e52f 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 @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="14.1" +version="14.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450" +sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-13-arm/20-xcode.sh b/coin/provisioning/qtci-macos-13-arm/20-xcode.sh index 6ee0fa42..a062b6e2 100755 --- a/coin/provisioning/qtci-macos-13-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-13-arm/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_14.1.xip 14.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2 diff --git a/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh index f73c57eb..3777e52f 100755 --- a/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="14.1" +version="14.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450" +sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6" InstallCommandLineTools $url $url $sha1 $packageName $version