mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-21 04:16:39 +08:00
Add ID for all targets
All targets should have ID. This way it's easier to refer to needed
target
Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 92ae8eb4ca)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
@@ -8,7 +8,7 @@ Configurations:
|
||||
# Build on recent macOS version with latest Xcode
|
||||
|
||||
-
|
||||
Id: 'macos-latest-xcode-universal-packaging-build'
|
||||
Id: 'macos-universal-on-x86_64'
|
||||
Template: 'qtci-macos-12-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Target arch: 'x86_64-arm64'
|
||||
@@ -22,7 +22,7 @@ Configurations:
|
||||
]
|
||||
|
||||
-
|
||||
Id: 'macos-latest-xcode-arm64-universal-build'
|
||||
Id: 'macos-universal-on-arm64'
|
||||
Template: 'qtci-macos-12-arm64'
|
||||
Compiler: 'Clang'
|
||||
Target arch: 'x86_64-arm64'
|
||||
@@ -41,43 +41,43 @@ Configurations:
|
||||
Template: 'qtci-macos-11-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
-
|
||||
Id: 'macos-11-arm64-tests'
|
||||
Template: 'qtci-macos-11.0-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
-
|
||||
Id: 'macos-12-arm64-tests'
|
||||
Template: 'qtci-macos-12-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
-
|
||||
Id: 'macos-13-arm64-tests'
|
||||
Template: 'qtci-macos-13-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
-
|
||||
Id: 'macos-12-x86_64-tests'
|
||||
Template: 'qtci-macos-12-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
-
|
||||
Id: 'macos-12-arm64-arm64-universal-build-tests'
|
||||
Id: 'macos-12-arm-on-arm64-tests'
|
||||
Template: 'qtci-macos-12-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'macos-latest-xcode-arm64-universal-build'
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
-
|
||||
Id: 'macos-12-x86_64-arm64-universal-build-tests'
|
||||
Id: 'macos-12-arm-on-x86_64-tests'
|
||||
Template: 'qtci-macos-12-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'macos-latest-xcode-arm64-universal-build'
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
|
||||
# =========================================================================
|
||||
# Developer build. Single architecture builds.
|
||||
@@ -86,7 +86,7 @@ Configurations:
|
||||
# Build on recent macOS version with latest Xcode
|
||||
|
||||
-
|
||||
Id: 'macos-latest-xcode-x86_64-developer-build'
|
||||
Id: 'macos-12-x86_64-developer-build'
|
||||
Template: 'qtci-macos-12-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
|
||||
@@ -97,7 +97,7 @@ Configurations:
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
|
||||
]
|
||||
-
|
||||
Id: 'macos-latest-xcode-arm64-developer-build'
|
||||
Id: 'macos-12-arm64-developer-build'
|
||||
Template: 'qtci-macos-12-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
|
||||
@@ -116,28 +116,28 @@ Configurations:
|
||||
Template: 'qtci-macos-11-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
|
||||
Platform dependency: 'macos-12-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'
|
||||
Platform dependency: 'macos-12-arm64-developer-build'
|
||||
-
|
||||
Id: 'macos-12-x86_64-developer-build-tests'
|
||||
Template: 'qtci-macos-12-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
|
||||
Platform dependency: 'macos-12-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'
|
||||
Platform dependency: 'macos-12-arm64-developer-build'
|
||||
-
|
||||
Id: 'macos-13-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-13-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly']
|
||||
Platform dependency: 'macos-latest-xcode-arm64-developer-build'
|
||||
Platform dependency: 'macos-12-arm64-developer-build'
|
||||
|
||||
Reference in New Issue
Block a user