forked from qt-creator/qt-creator
COIN: Switch to Qt 6.8 snapshots and its provisioning
Will be used for Qt Creator 15. Also remove the conditions. We run the precheck for all configurations listed in qt-creator.yaml, because we define that exactly for the precheck. So we do not need to change the conditions here because we switch to MSVC2022 in the config. Change-Id: Ibce3cfefcb165de8ea98466dcdf7ddf90f2b78dc Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -52,9 +52,6 @@ instructions:
|
|||||||
- condition: property
|
- condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
equals_value: Linux
|
equals_value: Linux
|
||||||
- condition: property
|
|
||||||
property: target.compiler
|
|
||||||
in_values: [GCC]
|
|
||||||
|
|
||||||
- type: Group
|
- type: Group
|
||||||
instructions:
|
instructions:
|
||||||
@@ -133,14 +130,9 @@ instructions:
|
|||||||
maxTimeBetweenOutput: 3600
|
maxTimeBetweenOutput: 3600
|
||||||
userMessageOnFailure: "Failed to build sdktool, check logs."
|
userMessageOnFailure: "Failed to build sdktool, check logs."
|
||||||
enable_if:
|
enable_if:
|
||||||
condition: and
|
condition: property
|
||||||
conditions:
|
property: host.os
|
||||||
- condition: property
|
equals_value: Windows
|
||||||
property: target.compiler
|
|
||||||
in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019]
|
|
||||||
- condition: property
|
|
||||||
property: target.arch
|
|
||||||
equals_value: X86_64
|
|
||||||
|
|
||||||
- type: UploadArtifact
|
- type: UploadArtifact
|
||||||
archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
|
archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
|
||||||
|
@@ -10,7 +10,7 @@ instructions:
|
|||||||
variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.7-based
|
variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.7-based
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_BASE_URL
|
variableName: QTC_QT_BASE_URL
|
||||||
variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.7/6.7.2-released/Qt"
|
variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/qt/6.8.0/release_content/"
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_MODULES
|
variableName: QTC_QT_MODULES
|
||||||
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
|
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
|
||||||
@@ -30,7 +30,7 @@ instructions:
|
|||||||
instructions:
|
instructions:
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_POSTFIX
|
variableName: QTC_QT_POSTFIX
|
||||||
variableValue: "-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-X86_64.7z"
|
variableValue: "-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z"
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_SDKTOOL_QT_EXT
|
variableName: QTC_SDKTOOL_QT_EXT
|
||||||
variableValue: ".zip"
|
variableValue: ".zip"
|
||||||
@@ -54,7 +54,7 @@ instructions:
|
|||||||
instructions:
|
instructions:
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_POSTFIX
|
variableName: QTC_QT_POSTFIX
|
||||||
variableValue: "-MacOS-MacOS_13-Clang-MacOS-MacOS_13-X86_64-ARM64.7z"
|
variableValue: "-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z"
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_SDKTOOL_QT_EXT
|
variableName: QTC_SDKTOOL_QT_EXT
|
||||||
variableValue: ".tar.xz"
|
variableValue: ".tar.xz"
|
||||||
|
@@ -1,34 +1,4 @@
|
|||||||
version: 2
|
version: 2
|
||||||
accept_configuration:
|
|
||||||
condition: or
|
|
||||||
conditions:
|
|
||||||
- condition: property
|
|
||||||
property: features
|
|
||||||
contains_value: LicenseCheck
|
|
||||||
- condition: and
|
|
||||||
conditions:
|
|
||||||
- condition: property
|
|
||||||
property: host.os
|
|
||||||
equals_value: Windows
|
|
||||||
- condition: property
|
|
||||||
property: host
|
|
||||||
equals_property: target
|
|
||||||
- condition: property
|
|
||||||
property: target.compiler
|
|
||||||
equals_value: MSVC2019
|
|
||||||
- condition: property
|
|
||||||
property: target.arch
|
|
||||||
not_equals_value: X86
|
|
||||||
- condition: and
|
|
||||||
conditions:
|
|
||||||
- condition: property
|
|
||||||
property: host.os
|
|
||||||
equals_value: Linux
|
|
||||||
- condition: and
|
|
||||||
conditions:
|
|
||||||
- condition: property
|
|
||||||
property: host.os
|
|
||||||
equals_value: MacOS
|
|
||||||
|
|
||||||
machine_type:
|
machine_type:
|
||||||
Build:
|
Build:
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
../../qt/qt5.git:
|
../../qt/qt5.git:
|
||||||
ref: "6.7"
|
ref: "6.8"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user