diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-06-22 08:21:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-06-22 09:47:05 +0000 |
| commit | 4c4f787e840f9443c4237a37b9c688ddcca768dd (patch) | |
| tree | 2418661c727d90ab1e9e1d2a72b3764daea32e67 /coin | |
| parent | 73e072c7bb7839ecddaa5c6a4bc6454317614afe (diff) | |
| download | qt-creator-4c4f787e840f9443c4237a37b9c688ddcca768dd.tar.gz | |
COIN: Fix installing Qt after script updates
'wget' is now imported by one of the python scripts
Change-Id: I8e4fe32f813550586d19ccb76a55ec7ed13441c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/provision.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml index 5d0431a273..302103ec3f 100644 --- a/coin/instructions/provision.yaml +++ b/coin/instructions/provision.yaml @@ -32,6 +32,15 @@ instructions: property: host.os in_values: [MacOS, Linux, Windows] - type: ExecuteCommand + command: "pip3 install wget colorlog" + maxTimeInSeconds: 1200 + maxTimeBetweenOutput: 120 + userMessageOnFailure: "Failed to install Python packages, check logs." + enable_if: + condition: property + property: host.os + in_values: [MacOS, Linux] + - type: ExecuteCommand command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --temp-path {{.AgentWorkingDir}}/build/qt_temp --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 3600 @@ -52,10 +61,10 @@ instructions: property: host.os equals_value: MacOS - type: ExecuteCommand - command: "pip.exe install pywin32" + command: "pip.exe install pywin32 wget colorlog" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 120 - userMessageOnFailure: "Failed to install win32api, check logs." + userMessageOnFailure: "Failed to install Python packages, check logs." enable_if: condition: property property: host.os |