diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-10-14 17:02:40 +0300 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-10-14 14:16:19 +0000 |
| commit | 2f03d5ca66fc8ed8f508b1ef8795ccb87a64a393 (patch) | |
| tree | 6094ef31e67d6da5d683c922bd96609b446b157d | |
| parent | 3f32944fd7993aa04f07d076d31ccb5cf433ee3a (diff) | |
CI: Fix license check instructions
Instead of defining our own instructions use ones from qtbase.
Pick-to: 6.5 6.8
Change-Id: I043a237df497ddebc59921c8e61fa57adc065108
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | coin/instructions/execute_license_check.yaml | 31 | ||||
| -rw-r--r-- | coin/module_config.yaml | 2 |
2 files changed, 1 insertions, 32 deletions
diff --git a/coin/instructions/execute_license_check.yaml b/coin/instructions/execute_license_check.yaml deleted file mode 100644 index 0bf4d3ca1..000000000 --- a/coin/instructions/execute_license_check.yaml +++ /dev/null @@ -1,31 +0,0 @@ -type: Group -instructions: - - type: ChangeDirectory - directory: "{{.AgentWorkingDir}}" - - type: InstallSourceArchive - maxTimeInSeconds: 600 - maxTimeBetweenOutput: 600 - project: qt/qtbase - ref: "CURRENT_BRANCH" - directory: qt/qtbase - userMessageOnFailure: > - Could not install source archive. Please investigate why. - - type: InstallSourceArchive - maxTimeInSeconds: 600 - maxTimeBetweenOutput: 600 - project: qt/qtqa - ref: master - directory: qt/qtqa-latest - userMessageOnFailure: > - Could not install source archive. Please investigate why. - - type: EnvironmentVariable - variableName: QT_MODULE_TO_TEST - variableValue: pyside/pyside-setup - userMessageOnFailure: > - Failed to set environment variable. This should not happen. - - type: ExecuteCommand - command: perl qt/qtqa-latest/tests/prebuild/license/tst_licenses.pl - maxTimeInSeconds: 7200 - maxTimeBetweenOutput: 120 - userMessageOnFailure: > - Failed to run license check script. diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 6deb88fba..94dc0f17e 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -105,7 +105,7 @@ upload_pyside: &upload_pyside instructions: LicenseCheck: - - !include "{{pyside/pyside-setup}}/execute_license_check.yaml" + - !include "{{qt/qtbase}}/run_license_check.yaml" Build: - !include "{{pyside/pyside-setup}}/common_environment.yaml" - !include "{{pyside/pyside-setup}}/find_path_to_msvc_compiler.yaml" |