diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-12-03 15:17:18 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-07 20:19:07 +0000 |
commit | dd4edc544597734568c9657b08e353364ca9c231 (patch) | |
tree | 5e5cdd66a7cd9f02b4bcdae01f7d619f2239049f | |
parent | c05d17862b357f6ca336347a68253bad06333820 (diff) |
coin: Run macOS x86_64 developer build tests for all modules
Aligns the way we test x86_64 and arm64 developer builds.
Change-Id: I87ea5e183b5ee29c62304b22eaf20c4b46ec3b0d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 3072446274acf7f52f4cdfabc20a656e35ce942b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | coin/platform_configs/macos-developer-build-tests.yaml | 30 | ||||
-rw-r--r-- | coin/platform_configs/macos.yaml | 27 | ||||
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 1 | ||||
-rw-r--r-- | coin/platform_configs/qtdeclarative.yaml | 1 | ||||
-rw-r--r-- | coin/platform_configs/qtwebengine.yaml | 3 |
5 files changed, 25 insertions, 37 deletions
diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml deleted file mode 100644 index 94e85246..00000000 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Version: 2 -Configurations: - - # These developer-build tests are only run for qtbase and qtdeclarative - # See macos.yaml for arm64 developer-build tests, run for all modules. - - - - Id: 'macos-10.14-x86_64-developer-build-tests' - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - - - Id: 'macos-10.15-x86_64-developer-build-tests' - Template: 'qtci-macos-10.15-x86_64-102' - Compiler: 'Clang' - Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - - - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11-x86_64-104' - Compiler: 'Clang' - Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - - - Id: 'macos-12-x86_64-developer-build-tests' - Template: 'qtci-macos-12-x86_64-102' - 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 0638daca..7985a109 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -82,17 +82,38 @@ Configurations: # Test on all supported macOS versions (deployment targets) - + Id: 'macos-10.14-x86_64-developer-build-tests' + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + - + Id: 'macos-10.15-x86_64-developer-build-tests' + Template: 'qtci-macos-10.15-x86_64-102' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + - + Id: 'macos-11-x86_64-developer-build-tests' + Template: 'qtci-macos-11-x86_64-104' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + - Id: 'macos-11-arm64-developer-build-tests' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-developer-build' - + Id: 'macos-12-x86_64-developer-build-tests' + Template: 'qtci-macos-12-x86_64-102' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + - Id: 'macos-12-arm64-developer-build-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-developer-build' - - # See macos-developer-build-tests.yaml for x86_64 tests, - # as we limit those to qtbase and declarative. diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 65a6b67d..1442b829 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -2,7 +2,6 @@ Version: 2 Include: [ cmake_platforms.yaml, cmake_platforms_static_tests.yaml, - macos-developer-build-tests.yaml, integrity.yaml, ios-tests.yaml, linux_android_tests.yaml diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 5dcfca93..bf3d33e7 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - macos-developer-build-tests.yaml, integrity.yaml, cmake_platforms_static_tests.yaml, linux_android_tests.yaml diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index 03773931..a9157b9f 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - macos-developer-build-tests.yaml + cmake_platforms.yaml ] Configurations: [] |