From c1a1e65cdc478a12a726ae2c0132c9eea9c9995d Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Thu, 22 Sep 2022 15:24:27 +0300 Subject: [PATCH] Provisioning: Xcode update to ARM macs Change-Id: I71828f5b126c6243163238aef2000dfb91cdbcb2 Reviewed-by: Heikki Halmet --- 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 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) 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..172d75d2 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.xip 14 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..4e5edfef 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" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252" +sha1="0d9cb1708d178866b3d56b88445bdf4d8ff984e3" 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..172d75d2 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.xip 14 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..4e5edfef 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" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="e709a707e5c5faef1620eb23f2e3c71eae38ad11" +sha1="0d9cb1708d178866b3d56b88445bdf4d8ff984e3" InstallCommandLineTools $url $url $sha1 $packageName $version