From 21ed2db77b95cf0c7774a26da4d6b73cd08d3568 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 9 Mar 2022 09:52:20 +0100 Subject: [PATCH] Test universal builds on arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2c2cc2a58cd954c8884955cd8bed79a961ef901b Reviewed-by: Tor Arne Vestbø --- coin/platform_configs/macos.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index aa12bbee..17a22e3e 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -19,6 +19,14 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang' ] + - + Id: 'macos-latest-xcode-arm64-universal-build' + Template: 'qtci-macos-12-arm64' + Compiler: 'Clang' + Target arch: 'x86_64-arm64' + Features: ['DoNotRunTests', 'WarningsAreErrors'] + Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON' + # Test on all supported macOS versions (deployment targets) - @@ -57,6 +65,18 @@ Configurations: Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' + - + Id: 'macos-12-arm64-arm64-universal-build-tests' + Template: 'qtci-macos-12-arm64' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-arm64-universal-build' + - + Id: 'macos-12-x86_64-arm64-universal-build-tests' + Template: 'qtci-macos-12-x86_64-102' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-arm64-universal-build' # ========================================================================= # Developer build. Single architecture builds.