lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-25 00:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update macOS Tier 1 images to use newer OS versions

Browse Source 
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>
This commit is contained in:
Heikki Halmet
2023-04-04 11:28:47 +00:00
parent 7ad2801f92
commit 76a06d574c
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/cmake_platforms.yaml
View File

@@ -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'

2
coin/platform_configs/cmake_platforms_static_tests.yaml
View File

@@ -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'

2
coin/platform_configs/cmake_platforms_target_android.yaml
View File

@@ -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'

2
coin/platform_configs/cmake_platforms_wasm.yaml
View File

@@ -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'

2
coin/platform_configs/ios-tests.yaml
View File

@@ -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'

14
coin/platform_configs/macos.yaml
View File

@@ -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'

2
coin/platform_configs/nightly_macos13.yaml
View File

@@ -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'

2
coin/platform_configs/qmake2cmake.yaml
View File

@@ -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']
-