From 117c1b30cd631a104131f88e534a48a15617ef97 Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Thu, 28 Sep 2023 15:50:31 +0300 Subject: [PATCH] Provisioning: Update macOS 14 Xcode version to 15 official release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia50d9363ba81c1a8cb9cd334a1b380a22518913e Reviewed-by: Tor Arne Vestbø --- coin/provisioning/qtci-macos-14-arm/20-xcode.sh | 2 +- .../qtci-macos-14-arm/21-install-commandlinetools.sh | 4 ++-- coin/provisioning/qtci-macos-14-x86_64/20-xcode.sh | 2 +- .../qtci-macos-14-x86_64/21-install-commandlinetools.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-macos-14-arm/20-xcode.sh b/coin/provisioning/qtci-macos-14-arm/20-xcode.sh index 8be3c92a..01ed3759 100755 --- a/coin/provisioning/qtci-macos-14-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-14-arm/20-xcode.sh @@ -19,4 +19,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_15_beta.xip 15_beta +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_15.xip 15 diff --git a/coin/provisioning/qtci-macos-14-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-14-arm/21-install-commandlinetools.sh index 831039e1..8784118a 100755 --- a/coin/provisioning/qtci-macos-14-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-14-arm/21-install-commandlinetools.sh @@ -6,9 +6,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="15_beta" +version="15" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="7bdcf926322191d3c72d981eb36f80210339477a" +sha1="f83aedc844c829e989a83a85b074585eb1959964" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-14-x86_64/20-xcode.sh index 8be3c92a..01ed3759 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/20-xcode.sh @@ -19,4 +19,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_15_beta.xip 15_beta +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_15.xip 15 diff --git a/coin/provisioning/qtci-macos-14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-14-x86_64/21-install-commandlinetools.sh index 831039e1..8784118a 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/21-install-commandlinetools.sh @@ -6,9 +6,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="15_beta" +version="15" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="7bdcf926322191d3c72d981eb36f80210339477a" +sha1="f83aedc844c829e989a83a85b074585eb1959964" InstallCommandLineTools $url $url $sha1 $packageName $version