From 7a027b4dfdf4baa65ebb07f748849aa47d5079b2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 23 Mar 2021 09:07:10 +0200 Subject: [PATCH] Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.0 Pick-to: 6.1 Task-number: QTQAINFRA-4230 Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4 Reviewed-by: Ville-Pekka Karhu Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.15-x86_64/21-install-commandlinetools.sh | 6 +++--- coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh | 2 +- .../qtci-macos-11.0-x86_64/21-install-commandlinetools.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh index f2014388..270d894a 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh @@ -50,4 +50,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/macos_10.15_catalina/Xcode_12.3.xip 12.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4 diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh index f13f7bae..ad047d1b 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,10 +37,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="12.3" +version="12.4" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName" -sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9" +sha1="eabb32d167da029dfc70af94de2bf61abd416ca1" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh index f2014388..270d894a 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh @@ -50,4 +50,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/macos_10.15_catalina/Xcode_12.3.xip 12.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4 diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh index f13f7bae..ad047d1b 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,10 +37,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="12.3" +version="12.4" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName" -sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9" +sha1="eabb32d167da029dfc70af94de2bf61abd416ca1" InstallCommandLineTools $url $url $sha1 $packageName $version