diff options
| -rw-r--r-- | coin/platform_configs/macos.yaml | 18 | ||||
| -rwxr-xr-x | coin/provisioning/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" |