From 6e94f4eaf002f7125c878ce38178641b3b46657d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 3 Nov 2022 11:39:51 +0000 Subject: [PATCH] Provisioning: Update Xcode version to 14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Command line tools are also updated Change-Id: Ic1d0882d395e014a4f33ed139c90800b3ba71cbf Reviewed-by: Tor Arne Vestbø (cherry picked from commit 20c8f11006154b9e241ca202bb3954f4aceed3d3) --- 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-12.0-arm/20-xcode.sh | 4 ++-- .../qtci-macos-12.0-arm/21-install-commandlinetools.sh | 6 +++--- coin/provisioning/qtci-macos-13-arm/20-xcode.sh | 4 ++-- .../qtci-macos-13-arm/21-install-commandlinetools.sh | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) 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 878ce325..9761cd2f 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_13.2.xip 13.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.1.xip 14.1 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 c50c1406..d5608b12 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="13.2" +version="14.1" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252" +sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450" 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 878ce325..6ee0fa42 100755 --- a/coin/provisioning/qtci-macos-12.0-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-12.0-arm/20-xcode.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -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_13.2.xip 13.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.1.xip 14.1 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 c50c1406..f73c57eb 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 @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="13.2" +version="14.1" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252" +sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450" 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 498cb0fb..6ee0fa42 100755 --- a/coin/provisioning/qtci-macos-13-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-13-arm/20-xcode.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -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_beta_5.xip 14_beta_5 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.1.xip 14.1 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 d308b69b..f73c57eb 100755 --- a/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="14_beta_5" +version="14.1" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="e709a707e5c5faef1620eb23f2e3c71eae38ad11" +sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450" InstallCommandLineTools $url $url $sha1 $packageName $version