diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-11-15 17:30:58 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2022-02-03 21:13:07 +0200 |
| commit | 1865d70ef892d3a06e7aef4f0861e28f0812dc2d (patch) | |
| tree | 9d8988410d21541c322abe98540c8cdf5d9db53a /coin/platform_configs | |
| parent | 88cde9e5003c1235bcceb8e723d518558dbd68e7 (diff) | |
Provisioning: Start using latest macOS 11 version 11.6
New tier 1 image's name format is qtci-macos-11-x86_64
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/cmake_platforms_static_tests.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/macos-developer-build-tests.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/macos.yaml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 1bd63658..893cb36a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -157,7 +157,7 @@ Configurations: Environment variables: [ 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] - - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' 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 dd37ed34..fc0c5a9f 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -14,7 +14,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF' diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml index ee16d6fd..94e85246 100644 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ b/coin/platform_configs/macos-developer-build-tests.yaml @@ -18,7 +18,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 0d08bdc2..0638daca 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -35,7 +35,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Id: 'macos-11-x86_64-tests' - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' |