From 3e380e35b038405b4524cf704183e9b82348626e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Tue, 16 Aug 2022 14:23:04 +0300 Subject: Update macOS11 (105) and macOS12 (105) templates Use templates which have Accessibility enabled for Squish. Task-number: QTQAINFRA-3559 Pick-to: 6.4 Change-Id: I9538ea48791ea81738a41b1e101552cfc3bd454b Reviewed-by: Ville-Pekka Karhu --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/cmake_platforms_wasm.yaml | 2 +- coin/platform_configs/ios-tests.yaml | 2 +- coin/platform_configs/macos.yaml | 14 +++++++------- coin/platform_configs/qmake2cmake.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 46f3e91e..57eac4f9 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -151,7 +151,7 @@ Configurations: ] - Id: 'ios-universal' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' 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 e23cd716..25ca50d2 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -20,7 +20,7 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}' ] - - Template: 'qtci-macos-11-x86_64-104' + Template: 'qtci-macos-11-x86_64-105' 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_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index e54113d8..53936393 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -38,7 +38,7 @@ Configurations: 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang'] - - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' 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 cc651ff2..46b2a471 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-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 9507a634..77a35baf 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -9,7 +9,7 @@ Configurations: - Id: 'macos-latest-xcode-universal-packaging-build' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] @@ -41,7 +41,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Id: 'macos-11-x86_64-tests' - Template: 'qtci-macos-11-x86_64-104' + Template: 'qtci-macos-11-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' @@ -59,7 +59,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Id: 'macos-12-x86_64-tests' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' @@ -71,7 +71,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-arm64-universal-build' - Id: 'macos-12-x86_64-arm64-universal-build-tests' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-universal-build' @@ -84,7 +84,7 @@ Configurations: - Id: 'macos-latest-xcode-x86_64-developer-build' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' @@ -111,7 +111,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11-x86_64-104' + Template: 'qtci-macos-11-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' @@ -123,7 +123,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-arm64-developer-build' - Id: 'macos-12-x86_64-developer-build-tests' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 7445b305..c855d156 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-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['DisableTests'] - diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index ad890e4e..38955c63 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -21,7 +21,7 @@ Configurations: ] - Id: 'macos-latest-xcode-universal-packaging-build' - Template: 'qtci-macos-12-x86_64-102' + Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] -- cgit v1.2.3