From ecaa03df216ab9fac80096788c71543b0251163e Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Wed, 18 Sep 2024 12:36:34 +0300 Subject: [PATCH] Provisioning: Update Xcode to official 16 for macOS 15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6578 Change-Id: Ie642355d482211c7b29f788fce44082abe904f7d Reviewed-by: Tor Arne Vestbø --- coin/provisioning/qtci-macos-15-arm/20-xcode.sh | 4 ++-- .../qtci-macos-15-arm/21-install-commandlinetools.sh | 6 +++--- coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh | 4 ++-- .../qtci-macos-15-x86_64/21-install-commandlinetools.sh | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/qtci-macos-15-arm/20-xcode.sh b/coin/provisioning/qtci-macos-15-arm/20-xcode.sh index 8020627b..ed8b4e9a 100755 --- a/coin/provisioning/qtci-macos-15-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-15-arm/20-xcode.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # This script installs Xcode @@ -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.ci.qt.io/hdd/www/input/mac/Xcode_16_beta_3.xip 16_beta_3 +InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_16.xip 16 diff --git a/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh index befe970b..3f7148c9 100755 --- a/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="16_beta_3" +version="16" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" -sha1="a7b0eba08b83e213d79f6d5c527e94c406e0bce9" +sha1="c6f1a7521d5da50c2bba3d83c0f3ee7df6d87d28" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh index 8020627b..ed8b4e9a 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # This script installs Xcode @@ -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.ci.qt.io/hdd/www/input/mac/Xcode_16_beta_3.xip 16_beta_3 +InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_16.xip 16 diff --git a/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh index befe970b..3f7148c9 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="16_beta_3" +version="16" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" -sha1="a7b0eba08b83e213d79f6d5c527e94c406e0bce9" +sha1="c6f1a7521d5da50c2bba3d83c0f3ee7df6d87d28" InstallCommandLineTools $url $url $sha1 $packageName $version