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:
Eike Ziller
2024-09-05 08:59:26 +02:00
parent cda56c665c
commit 1625ef83bd
4 changed files with 7 additions and 45 deletions

View File

@@ -52,9 +52,6 @@ instructions:
- condition: property
property: host.os
equals_value: Linux
- condition: property
property: target.compiler
in_values: [GCC]
- type: Group
instructions:
@@ -133,14 +130,9 @@ instructions:
maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to build sdktool, check logs."
enable_if:
condition: and
conditions:
- condition: property
property: target.compiler
in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019]
- condition: property
property: target.arch
equals_value: X86_64
condition: property
property: host.os
equals_value: Windows
- type: UploadArtifact
archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"

View File

@@ -10,7 +10,7 @@ instructions:
variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.7-based
- type: EnvironmentVariable
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
variableName: QTC_QT_MODULES
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
@@ -30,7 +30,7 @@ instructions:
instructions:
- type: EnvironmentVariable
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
variableName: QTC_SDKTOOL_QT_EXT
variableValue: ".zip"
@@ -54,7 +54,7 @@ instructions:
instructions:
- type: EnvironmentVariable
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
variableName: QTC_SDKTOOL_QT_EXT
variableValue: ".tar.xz"

View File

@@ -1,34 +1,4 @@
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:
Build:

View File

@@ -1,4 +1,4 @@
dependencies:
../../qt/qt5.git:
ref: "6.7"
ref: "6.8"