aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2022-08-04 00:12:37 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-05 00:22:51 +0000
commit56d4c686745d47a82140fe97bd0a85a60a9009a1 (patch)
tree2b36e3c9cfcc42e5f2b11faff1bf05033af184f8
parente8c8a5d193649979ff52e739ff1759ef34d315ec (diff)
coin: Build and test iOS on macOS 12
Ensures a recent Xcode version is used. Change-Id: I15b82417d336af3ea9ad385bd6d1f4e08d64c6c0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 860bd111e271a6327455cf65a3bc6963df4b8780) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
-rw-r--r--coin/platform_configs/ios-tests.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index d2b737a8..fdeedcf1 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -131,7 +131,7 @@ Configurations:
]
-
Id: 'ios-universal'
- Template: 'qtci-macos-11-x86_64-104'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml
index 71f1d032..cc651ff2 100644
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: "ios-tests-target"
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'