diff options
| author | Dimitrios Apostolou <jimis@qt.io> | 2020-02-06 17:19:55 +0100 |
|---|---|---|
| committer | Dimitrios Apostolou <jimis@qt.io> | 2020-02-15 07:39:06 +0100 |
| commit | d757c6d0ece7823a28c8601a56f567580aa8cf16 (patch) | |
| tree | a2c6f01a28ce7afb0bbbe71e71f7d422993d605f /coin/provisioning/qtci-macos-10.13-x86_64 | |
| parent | 0d208f77ec8c18f5907fbacc94a2b420e2710b3a (diff) | |
Try to catch all errors when sdkmanager installs
Task-number: QTQAINFRA-3531
Change-Id: I008c31a824287c60e67a665d0c2a3aebec863929
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index aa0935f0..bc123111 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -37,7 +37,7 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version -set -ex +set -e # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" @@ -68,8 +68,11 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" -# Run the following command under `eval` or `sh -c` so that the shell properly splits it +# Stop the sdkmanager from printing thousands of lines of #hashmarks. +# Run the following command under `eval` or `sh -c` so that the shell properly splits it. sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" +# But don't let the pipeline hide sdkmanager failures. +set -o pipefail echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." (echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager" \ |