aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille-Pekka Karhu <ville-pekka.karhu@qt.io>2024-03-18 15:50:41 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-04-03 08:11:28 +0000
commit2d690821553df050ba8ae94c895c51526ec45288 (patch)
treed85e9862406008e7b393d6c1fc4791042a13e7ab
parent7c9b1a44d560a32cdbf3ea657df2113e65cdeb74 (diff)
Platform configs: Replace hardware macOS 14 ARM with virtualized macOS 14 ARM
Task-number: QTQAINFRA-5831 Change-Id: Ibdd2360a55855d04bf02d6047870f48319c2ce9d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 9ceb1b5ef5b168c7988ff29954d96eaa8d95acd4) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--coin/platform_configs/macos.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index dbfe113c..8469f045 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -78,15 +78,9 @@ Configurations:
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-14-arm64-tests'
- Template: 'qtci-macos-14-arm64'
- Compiler: 'Clang'
- Features: ['TestOnly', 'Packaging']
- Platform dependency: 'macos-universal-on-x86_64'
- -
- Id: 'macos-14-arm64-tart-tests'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
- Features: ['TestOnly', 'Packaging', 'InsignificantTests']
+ Features: ['TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
# Test the universal packaging built on arm64
@@ -167,13 +161,7 @@ Configurations:
Platform dependency: 'macos-13-arm64-developer-build'
-
Id: 'macos-14-arm64-developer-build-tests'
- Template: 'qtci-macos-14-arm64'
- Compiler: 'Clang'
- Features: ['TestOnly']
- Platform dependency: 'macos-13-arm64-developer-build'
- -
- Id: 'macos-14-arm64-tart-developer-build-tests'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
- Features: ['TestOnly', 'InsignificantTests']
+ Features: ['TestOnly']
Platform dependency: 'macos-13-arm64-developer-build'