diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-04 10:58:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-11 13:36:18 +0000 |
| commit | b3384054778950cc4c1b8f0b21553112f4443948 (patch) | |
| tree | aa76c62f0dc5dd1f16a8d86a1511267121d7cba5 /coin | |
| parent | 525a284f3e702596af3c2bd37d92340fa5ecb248 (diff) | |
Require Qt 6.2 for building Qt Creator
Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/build.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/common_environment.yaml | 51 | ||||
| -rw-r--r-- | coin/instructions/provision.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/test.yaml | 4 |
4 files changed, 17 insertions, 46 deletions
diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index 3110b3b3fea..f9219f1dd37 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -153,3 +153,7 @@ instructions: maxTimeInSeconds: 1800 maxTimeBetweenOutput: 1800 +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 6141d447915..2df7ad16e38 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -47,52 +47,6 @@ instructions: condition: property property: target.os equals_value: MacOS - enable_if: - condition: property - property: features - not_contains_value: "Qt5" - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_BASE_URL - variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/5.15/5.15.2-final-released/latest" - - type: EnvironmentVariable - variableName: QTC_QT_MODULES - variableValue: "qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtsvg qttools qttranslations" - - type: EnvironmentVariable - variableName: MACOSX_DEPLOYMENT_TARGET - variableValue: 10.13 - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_POSTFIX - variableValue: "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z" - enable_if: - condition: property - property: target.os - equals_value: Windows - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_POSTFIX - variableValue: "-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z" - enable_if: - condition: property - property: target.os - equals_value: Linux - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_POSTFIX - variableValue: "-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z" - enable_if: - condition: property - property: target.os - equals_value: MacOS - enable_if: - condition: property - property: features - contains_value: "Qt5" - type: PrependToEnvironmentVariable variableName: PATH @@ -133,3 +87,8 @@ instructions: condition: property property: host.os equals_value: Linux + +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml index 302103ec3f6..37661084e64 100644 --- a/coin/instructions/provision.yaml +++ b/coin/instructions/provision.yaml @@ -85,3 +85,7 @@ instructions: property: target.arch equals_value: X86_64 +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/coin/instructions/test.yaml b/coin/instructions/test.yaml index 7786d75f5ed..1cbd4fd16d1 100644 --- a/coin/instructions/test.yaml +++ b/coin/instructions/test.yaml @@ -7,3 +7,7 @@ instructions: maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed to run tests, check logs" +enable_if: + condition: property + property: features + not_contains_value: "Qt5" |