From 0d73eb694893406c48cbf6430a4cfc43fa7c31ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 29 Apr 2026 14:26:14 +0200 Subject: [PATCH] Bump macOS 14 build targets to macOS 15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for minimum Xcode and SDK bump. Change-Id: Id5ebffff76338b821c42b347e643a7822abc2eff Reviewed-by: Nils Petter Skålerud Reviewed-by: Ville-Pekka Karhu --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_release.yaml | 2 +- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 2 +- coin/platform_configs/ios-tests.yaml | 2 +- coin/platform_configs/nightly_unity_builds.yaml | 2 +- coin/platform_configs/qtgradleplugin.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- coin/platform_configs/quick-minimal.yaml | 4 ++-- .../qtci-macos-15-arm/50-openssl_for_android_darwin.sh | 7 +++++++ coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh | 2 +- 11 files changed, 19 insertions(+), 12 deletions(-) create mode 100755 coin/provisioning/qtci-macos-15-arm/50-openssl_for_android_darwin.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 92a953b8..3ecdd63c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -280,7 +280,7 @@ Configurations: ] - Id: 'ios-universal' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 512fb44a..cf18f652 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -55,7 +55,7 @@ Configurations: - Id: 'macos-universal-on-x86_64-minimal-static-test' - Template: 'qtci-macos-14-x86_64-105' + Template: 'qtci-macos-15-x86_64-103' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests'] diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index f97e8acc..dad2a661 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -27,7 +27,7 @@ Configurations: ] - Id: 'macos-minimal-static' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index fa33d2b7..8b87bdb0 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-arm64-on-macos' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index a5e0916c..13808d2f 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: "ios-tests-on-macos" - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index 1c310a44..870c9e15 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -46,7 +46,7 @@ Configurations: ] - Id: 'macos-universal-on-arm64-unity-build' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] diff --git a/coin/platform_configs/qtgradleplugin.yaml b/coin/platform_configs/qtgradleplugin.yaml index d6786ad1..913f7836 100644 --- a/coin/platform_configs/qtgradleplugin.yaml +++ b/coin/platform_configs/qtgradleplugin.yaml @@ -8,7 +8,7 @@ Configurations: Features: ['Packaging', 'UseConfigure'] - Id: 'qtgp-on-macos' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Features: ['TestOnly'] - diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 9b746a25..dff3a9df 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -30,8 +30,8 @@ Include: [ # Static build configurations for tools Configurations: - - Id: 'macos-14-latest-xcode-universal_Static' - Template: 'qtci-macos-14-arm-106' + Id: 'macos-latest-xcode-universal_Static' + Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] diff --git a/coin/platform_configs/quick-minimal.yaml b/coin/platform_configs/quick-minimal.yaml index c2e2901a..676ffa90 100644 --- a/coin/platform_configs/quick-minimal.yaml +++ b/coin/platform_configs/quick-minimal.yaml @@ -426,7 +426,7 @@ Configurations: ] - Id: 'android-quick-minimal' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' @@ -832,7 +832,7 @@ Configurations: ] - Id: 'ios-quick-minimal' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/provisioning/qtci-macos-15-arm/50-openssl_for_android_darwin.sh b/coin/provisioning/qtci-macos-15-arm/50-openssl_for_android_darwin.sh new file mode 100755 index 00000000..35365c23 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/50-openssl_for_android_darwin.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Copyright (C) 2025 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/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh index 5023fefc..230c5016 100755 --- a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh @@ -5,5 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" -#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"