summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-04-13 11:38:39 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-13 11:38:39 +0200
commit8710c7d9cf90ad7ab542451b3fb36bb97011a8aa (patch)
tree0e60ea439dae4b823bc910fb85cef488754092e1 /coin/provisioning/qtci-linux-openSUSE-15.0-x86_64
parent869c15629d8397bc725c61da423a4a038ef4d395 (diff)
parentf31970d5ac48cd2ae6601aca32738ea718edb265 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: coin/platform_configs/qt3d-runtime.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-15.0-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh1
2 files changed, 3 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
index 208762d3..6c5d2a0f 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
@@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv
sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
+# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
index ecce5ae7..09a76778 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/emsdk.sh
source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"