diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-20 10:50:51 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-25 09:37:04 +0200 |
commit | 565ca05254750f76292ecd5dc7dda8b5dfe162c4 (patch) | |
tree | 47a113bf8f837048e50711dd9049ace06a193161 /coin/platform_configs | |
parent | 4d5e4200097a3f25c020aecb9a959f418da2cbb1 (diff) |
coin: Make macOS ARM packaging config test significant for all modules
Change-Id: Icc30025a33de602e6677b47f131b0557a4d2eabd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r-- | coin/platform_configs/macos-universal-build-tests.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/macos.yaml | 6 | ||||
-rw-r--r-- | coin/platform_configs/qt5.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 3 | ||||
-rw-r--r-- | coin/platform_configs/qtdeclarative.yaml | 3 | ||||
-rw-r--r-- | coin/platform_configs/qtquickcontrols2.yaml | 3 |
6 files changed, 10 insertions, 21 deletions
diff --git a/coin/platform_configs/macos-universal-build-tests.yaml b/coin/platform_configs/macos-universal-build-tests.yaml deleted file mode 100644 index 0699e052..00000000 --- a/coin/platform_configs/macos-universal-build-tests.yaml +++ /dev/null @@ -1,8 +0,0 @@ -Version: 2 -Configurations: - - - Id: 'macos-11-arm64-tests' - Template: 'qtci-macos-11.0-arm64' - Compiler: 'Clang' - Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index d05277f9..1b5dfd4c 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -33,6 +33,12 @@ Configurations: Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' + - + Id: 'macos-11-arm64-tests' + Template: 'qtci-macos-11.0-arm64' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-latest-xcode-universal-packaging-build' # Build developer builds for all modules, but only run tests for qtbase and declarative. # See macos-developer-build-tests.yaml for the tests diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index c1989f51..c3233842 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,9 +1,3 @@ Version: 2 Include: [cmake_platforms.yaml] -Configurations: - - - Id: 'macos-11-arm64-tests' - Template: 'qtci-macos-11.0-arm64' - Compiler: 'Clang' - Features: ['Sccache', 'TestOnly', 'InsignificantTests'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' +Configurations: [] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 740ef1d7..b9623434 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -2,8 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml, cmake_platforms_static_tests.yaml, - macos-developer-build-tests.yaml, - macos-universal-build-tests.yaml + macos-developer-build-tests.yaml ] Configurations: - diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index be0a2497..03773931 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, - macos-universal-build-tests.yaml + macos-developer-build-tests.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquickcontrols2.yaml b/coin/platform_configs/qtquickcontrols2.yaml index af7bc176..17ae1945 100644 --- a/coin/platform_configs/qtquickcontrols2.yaml +++ b/coin/platform_configs/qtquickcontrols2.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - macos-universal-build-tests.yaml + cmake_platforms.yaml ] Configurations: [] |