From 361cc1e22ccb7e39d1d576b05ade872e21842450 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 5 Dec 2023 15:27:46 +0100 Subject: [PATCH] coin: Bump macOS host templates to 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We support Xcode 14 (SDK 13) as the minimum, documented on https://doc-snapshots.qt.io/qt6-dev/macos.html Bump our macos static tests and ios tests platforms to build on macOS 13, just like all other macos configs, and to also follow what we document. We can then enforce the minimum SDK version as a build time error when building qtbase. Change-Id: I7ce223983a31c14f8997d2e6f9b061909e326f6d Reviewed-by: Tor Arne Vestbø --- coin/platform_configs/cmake_platforms_static_tests.yaml | 4 ++-- coin/platform_configs/ios-tests.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index d3fcf1c8..e6a98abb 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -22,8 +22,8 @@ Configurations: 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', ] - - Id: 'macos-11-minimal-static' - Template: 'qtci-macos-11-x86_64-106' + Id: 'macos-minimal-static' + Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index 9b04515f..a1b6b42a 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-12-x86_64-106' + Template: 'qtci-macos-13-x86_64-103' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang'