From c1485ecb2cebec7d5a709b24ad9bff01233f36ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 3 Jun 2024 12:12:28 +0200 Subject: [PATCH] coin: Replace bare metal macOS ARM configurations with Tart VMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.8 Change-Id: Idf84ead53ea27eedfa571ee5d7a44b7a496229bb Reviewed-by: Aku Pietikäinen Reviewed-by: Jukka Jokiniva --- coin/platform_configs/macos.yaml | 34 ++------------------------------ 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 76052c54..d715b338 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -60,27 +60,15 @@ Configurations: - Id: 'macos-12-arm64-tests' - Template: 'qtci-macos-12-arm64' - Compiler: 'Clang' - Features: ['TestOnly', 'Packaging'] - Platform dependency: 'macos-universal-on-x86_64' - - - Id: 'macos-12-arm64-tart-tests' Template: 'qtci-macos-12-arm-102' Compiler: 'Clang' - Features: ['TestOnly'] + Features: ['TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-13-arm64-tests' - Template: 'qtci-macos-13-arm64' - Compiler: 'Clang' - Features: ['TestOnly', 'Packaging'] - Platform dependency: 'macos-universal-on-x86_64' - - - Id: 'macos-13-arm64-tart-tests' Template: 'qtci-macos-13-arm-107' Compiler: 'Clang' - Features: ['TestOnly'] + Features: ['TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-14-arm64-tests' @@ -93,12 +81,6 @@ Configurations: - Id: 'macos-12-arm-on-arm64-tests' - Template: 'qtci-macos-12-arm64' - Compiler: 'Clang' - Features: ['TestOnly'] - Platform dependency: 'macos-universal-on-arm64' - - - Id: 'macos-12-arm-on-arm64-tart-tests' Template: 'qtci-macos-12-arm-102' Compiler: 'Clang' Features: ['TestOnly'] @@ -154,24 +136,12 @@ Configurations: # Test on all supported macOS versions (deployment targets) - Id: 'macos-12-arm64-developer-build-tests' - Template: 'qtci-macos-12-arm64' - Compiler: 'Clang' - Features: ['TestOnly'] - Platform dependency: 'macos-14-arm64-developer-build' - - - Id: 'macos-12-arm64-tart-developer-build-tests' Template: 'qtci-macos-12-arm-102' Compiler: 'Clang' Features: ['TestOnly'] 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-14-arm64-developer-build' - - - Id: 'macos-13-arm64-tart-developer-build-tests' Template: 'qtci-macos-13-arm-107' Compiler: 'Clang' Features: ['TestOnly']