From ca70ac0d1600a89533c7160213b13b5cf1d5e3a1 Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Thu, 18 Sep 2025 14:10:24 +0300 Subject: [PATCH] Provisioning: Update macOS 26 ARM to official release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update also Xcode to 26 official release Task-number: QTQAINFRA-7196 Change-Id: I3549f0b5e7a153cb2728a66a7d69ab4378e0acb6 Reviewed-by: Tor Arne Vestbø Reviewed-by: Aku Pietikäinen --- coin/platform_configs/macos.yaml | 6 +++--- coin/provisioning/qtci-macos-26-arm/20-xcode.sh | 2 +- .../qtci-macos-26-arm/21-install-commandlinetools.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 77ff7fed..70e59794 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -64,7 +64,7 @@ Configurations: Platform dependency: 'macos-universal-on-arm64' - Id: 'macos-26-arm64-tests' - Template: 'qtci-macos-26-arm-102' + Template: 'qtci-macos-26-arm-104' Compiler: 'Clang' Features: ['TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure'] Platform dependency: 'macos-universal-on-arm64' @@ -98,7 +98,7 @@ Configurations: ] - Id: 'macos-26-arm64-developer-build' - Template: 'qtci-macos-26-arm-102' + Template: 'qtci-macos-26-arm-104' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant'] Configure arguments: '-developer-build -nomake examples -debug -framework' @@ -128,7 +128,7 @@ Configurations: Platform dependency: 'macos-arm64-developer-build' - Id: 'macos-26-arm64-developer-build-tests' - Template: 'qtci-macos-26-arm-102' + Template: 'qtci-macos-26-arm-104' Compiler: 'Clang' Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] Platform dependency: 'macos-26-arm64-developer-build' diff --git a/coin/provisioning/qtci-macos-26-arm/20-xcode.sh b/coin/provisioning/qtci-macos-26-arm/20-xcode.sh index 6f678c2d..92b79e28 100755 --- a/coin/provisioning/qtci-macos-26-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-26-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.ci.qt.io/hdd/www/input/mac/Xcode_26_beta_5.xip 26_beta_5 +InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_26_Universal.xip 26_Universal diff --git a/coin/provisioning/qtci-macos-26-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-26-arm/21-install-commandlinetools.sh index 9aee3531..ef0cc22c 100755 --- a/coin/provisioning/qtci-macos-26-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-26-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="26_beta_5" +version="26" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" -sha1="34f48ceda970323de6e9f66e84c79ddb6b10bee7" +sha1="6dae65a03bd227756965f2cd2d375ae5b1550db6" InstallCommandLineTools $url $url $sha1 $packageName $version