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

coin: Move all builds over to macOS 12

Browse Source 
Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit b19b02173c)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø
2021-12-03 15:10:26 +01:00
parent 2ef984eac1
commit 2ec7e5a365
2 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,4 +27,4 @@ Configurations:
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-latest-xcode-x86_64-developer-build'
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

60
coin/platform_configs/macos.yaml
View File

@@ -1,10 +1,15 @@
Version: 2
Configurations:
# Build with latest Xcode
# =========================================================================
# Packaging. Universal build with both x86_64 and arm64 architectures.
# =========================================================================
# Build on recent macOS version with latest Xcode
-
# This is a universal build containing both x86_64 and arm64 architectures
Id: 'macos-latest-xcode-universal-packaging-build'
Template: 'qtci-macos-11.0-x86_64-102'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
@@ -13,20 +18,9 @@ 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 -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
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-10.14-x86_64-tests'
Template: 'qtci-macos-10.14-x86_64'
@@ -64,36 +58,29 @@ Configurations:
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.
# See macos-developer-build-tests.yaml for the tests
# =========================================================================
# Developer build. Single architecture builds.
# =========================================================================
# Build on recent macOS version with latest Xcode
-
Id: 'macos-latest-xcode-x86_64-developer-build'
Template: 'qtci-macos-11.0-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}}'
-
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.
# Note: We do not include OpenSSL or PostgreSQL in this build, as the M1 CI machines are not provisioned for that yet.
-
Id: 'macos-latest-xcode-arm64-developer-build'
Template: 'qtci-macos-11.0-arm64'
Compiler: 'Clang'
Features: ['DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON'
-
Id: 'macos-12-xcode-arm64-developer-build'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON'
# Note: We do not include OpenSSL or PostgreSQL in this build,
# as the M1 CI machines are not provisioned for that yet.
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-11-arm64-developer-build-tests'
Template: 'qtci-macos-11.0-arm64'
@@ -105,4 +92,7 @@ Configurations:
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['TestOnly', 'InsignificantTests']
Platform dependency: 'macos-12-xcode-arm64-developer-build'
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.