diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-25 17:55:26 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-06-15 08:01:11 +0300 |
| commit | b90fef29dca7e81dc7fe44d4696d052bcf6cd7ab (patch) | |
| tree | f02e888d5346eff62a7bb328df77526a284a6153 | |
| parent | 0a5e63dce9b7a865a213984d0dfe487922d93290 (diff) | |
coin: Make macOS on ARM developer-build tests significant
Pick-to: dev
Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | coin/platform_configs/macos-developer-build-tests.yaml | 4 | ||||
| -rw-r--r-- | coin/platform_configs/macos.yaml | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml index 6a6bae23..660baca2 100644 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ b/coin/platform_configs/macos-developer-build-tests.yaml @@ -1,5 +1,9 @@ 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' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 00336bb2..1e89b3ec 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -40,7 +40,7 @@ Configurations: Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' - # Build developer builds for all modules, but only run tests for qtbase and declarative. + # Build x86_64 developer-builds for all modules, but only run tests for qtbase and declarative. # See macos-developer-build-tests.yaml for the tests - Id: 'macos-latest-xcode-x86_64-developer-build' @@ -53,10 +53,17 @@ Configurations: 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' ] - # ARM64 target built on apple silicon + # Build arm64 developer-builds for all modules, and run their tests. This ensures that we have full + # arm64 build and test coverage, regardless of possible issues with the universal build. - Id: 'macos-latest-xcode-arm64-developer-build' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' - Features: ['InsignificantTests'] + Features: ['DoNotRunTests'] Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' + - + 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' |