From 673c5ae87fac3d2c2faa69a7af2a43efcc529f8e Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Wed, 27 Mar 2024 17:24:02 +0200 Subject: [PATCH] Platform Configs: Replace macOS 13 with macOS 14 as build and packaging target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also switches to building with Xcode 15, as that's the Xcode currently provisioned on our macOS 14 VMs. The gRPC provisioning has been disabled for macOS 14 on ARM due to linking errors for OpenSSL due to a faulty CMake find scripts or tests. Change-Id: Ia99720c8f1813bb0baf2062e3488202a4191eaf0 Reviewed-by: Tor Arne Vestbø --- coin/platform_configs/macos.yaml | 18 +++++++++--------- .../qtci-macos-14-arm/36-install_grpc.sh | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index dc33e00e..ff2645d4 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -9,7 +9,7 @@ Configurations: - Id: 'macos-universal-on-x86_64' - Template: 'qtci-macos-13-x86_64-103' + Template: 'qtci-macos-14-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] @@ -22,7 +22,7 @@ Configurations: - Id: 'macos-universal-on-arm64' - Template: 'qtci-macos-13-arm64' + Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] @@ -111,8 +111,8 @@ Configurations: # Build on recent macOS version with latest Xcode - - Id: 'macos-13-x86_64-developer-build' - Template: 'qtci-macos-13-x86_64-103' + Id: 'macos-14-x86_64-developer-build' + Template: 'qtci-macos-14-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' @@ -122,8 +122,8 @@ Configurations: 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - - Id: 'macos-13-arm64-developer-build' - Template: 'qtci-macos-13-arm64' + Id: 'macos-14-arm64-developer-build' + Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' @@ -139,16 +139,16 @@ Configurations: Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-13-arm64-developer-build' + Platform dependency: 'macos-14-arm64-developer-build' - Id: 'macos-13-arm64-developer-build-tests' Template: 'qtci-macos-13-arm64' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-13-arm64-developer-build' + Platform dependency: 'macos-14-arm64-developer-build' - Id: 'macos-14-arm64-developer-build-tests' Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-13-arm64-developer-build' + Platform dependency: 'macos-14-arm64-developer-build' diff --git a/coin/provisioning/qtci-macos-14-arm/36-install_grpc.sh b/coin/provisioning/qtci-macos-14-arm/36-install_grpc.sh index ecd6a51f..d2860845 100755 --- a/coin/provisioning/qtci-macos-14-arm/36-install_grpc.sh +++ b/coin/provisioning/qtci-macos-14-arm/36-install_grpc.sh @@ -5,5 +5,6 @@ set -ex # shellcheck source=../common/unix/install_grpc.sh -source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh" +# Temporarily disabled due to OpenSSL linking errors +#source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh"