summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2023-04-04 11:28:47 +0000
committerHeikki Halmet <heikki.halmet@qt.io>2023-04-13 05:08:20 +0000
commit76a06d574c30397b390758be1595e092cf15f385 (patch)
treeecbe47a514df4a1e7bc674546a41496c5ea40e9a
parent7ad2801f929d5608ca455cabdc4099f5f7a56366 (diff)
downloadqt5-76a06d574c30397b390758be1595e092cf15f385.tar.gz
Update macOS Tier 1 images to use newer OS versions
macOS 11.7.5 macOS 12.6.4 macOS 13.3 Pick-to: 6.5 6.4 6.2 5.15 Change-Id: Ib3cb27fc8716baa52893a6c52fe3589f5e7daac1 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml2
-rw-r--r--coin/platform_configs/cmake_platforms_static_tests.yaml2
-rw-r--r--coin/platform_configs/cmake_platforms_target_android.yaml2
-rw-r--r--coin/platform_configs/cmake_platforms_wasm.yaml2
-rw-r--r--coin/platform_configs/ios-tests.yaml2
-rw-r--r--coin/platform_configs/macos.yaml14
-rw-r--r--coin/platform_configs/nightly_macos13.yaml2
-rw-r--r--coin/platform_configs/qmake2cmake.yaml2
8 files changed, 14 insertions, 14 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 1a9cf594..179a75a8 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -195,7 +195,7 @@ Configurations:
]
-
Id: 'ios-universal'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml
index 4102c5ab..ab34c2b2 100644
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -23,7 +23,7 @@ Configurations:
]
-
Id: 'macos-11-minimal-static'
- Template: 'qtci-macos-11-x86_64-105'
+ Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml
index 8d477db8..45923c3b 100644
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index f26322de..6104f3e2 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -31,7 +31,7 @@ Configurations:
]
-
Id: 'webassembly-macos-thread'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml
index 20221161..9b04515f 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-on-macos"
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index c530730a..8fe91fa8 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-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -38,7 +38,7 @@ Configurations:
-
Id: 'macos-11-x86_64-tests'
- Template: 'qtci-macos-11-x86_64-105'
+ Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
@@ -62,7 +62,7 @@ Configurations:
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-12-x86_64-tests'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
@@ -74,7 +74,7 @@ Configurations:
Platform dependency: 'macos-universal-on-arm64'
-
Id: 'macos-12-arm-on-x86_64-tests'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-universal-on-arm64'
@@ -87,7 +87,7 @@ Configurations:
-
Id: 'macos-12-x86_64-developer-build'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
@@ -113,7 +113,7 @@ Configurations:
-
Id: 'macos-11-x86_64-developer-build-tests'
- Template: 'qtci-macos-11-x86_64-105'
+ Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
@@ -125,7 +125,7 @@ Configurations:
Platform dependency: 'macos-12-arm64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
diff --git a/coin/platform_configs/nightly_macos13.yaml b/coin/platform_configs/nightly_macos13.yaml
index cb459201..d011cedd 100644
--- a/coin/platform_configs/nightly_macos13.yaml
+++ b/coin/platform_configs/nightly_macos13.yaml
@@ -8,7 +8,7 @@ Include: [
Configurations:
-
Id: 'macos-13-x86_64-developer-build-tests'
- Template: 'qtci-macos-13-x86_64-102'
+ Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml
index 9eb625c5..876d07e8 100644
--- a/coin/platform_configs/qmake2cmake.yaml
+++ b/coin/platform_configs/qmake2cmake.yaml
@@ -6,7 +6,7 @@ Configurations:
Compiler: 'MSVC2019'
Features: ['DisableTests']
-
- Template: 'qtci-macos-12-x86_64-105'
+ Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['DisableTests']
-