lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Add macOS Monterey (12) x86 to CI

Browse Source 
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Ville-Pekka Karhu
2021-11-01 14:26:33 +02:00
committed by Heikki Halmet
parent 1b1005038b
commit 7e2882d0a7
46 changed files with 822 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/platform_configs/macos-developer-build-tests.yaml
View File

@@ -22,3 +22,9 @@ Configurations:
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-12-latest-xcode-x86_64-developer-build'

23
coin/platform_configs/macos.yaml
View File

@@ -13,6 +13,18 @@ Configurations:
'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
-
# This is a universal build containing both x86_64 and arm64 architectures
Id: 'macos-12-latest-xcode-universal-packaging-build'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
Environment variables: [
'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
# Then run tests on all supported deployment targets
-
@@ -44,6 +56,11 @@ Configurations:
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging', 'InsignificantTests']
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
# Build x86_64 developer-builds for all modules, but only run tests for qtbase and declarative.
@@ -54,6 +71,12 @@ Configurations:
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
-
Id: 'macos-12-latest-xcode-x86_64-developer-build'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
# 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.