forked from qt-creator/qt-creator
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>
This commit is contained in:
@ -31,6 +31,15 @@ instructions:
|
||||
condition: property
|
||||
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
|
||||
@ -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
|
||||
|
Reference in New Issue
Block a user