From 9c71fcd258f3b35b4a135769421b7eb583caa92d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Sun, 24 Jan 2021 13:02:44 +0200 Subject: Provisioning: get-pip.py address changed for python 2.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For python27 get-pip file's location has been changed and we need to use two different get-pip files for different python versions. Let's also cache these python files and use cache as primary url. Task-number: QTQAINFRA-4210 Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi (cherry picked from commit 6d20944daf78c50b0de03e516293c87959616623) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit b66e4773c82d6508e5952244cabf955a487cb6af) Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/pip.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/pip.sh b/coin/provisioning/common/macos/pip.sh index 2d07db85..b1c9a864 100755 --- a/coin/provisioning/common/macos/pip.sh +++ b/coin/provisioning/common/macos/pip.sh @@ -1,11 +1,18 @@ #!/usr/bin/env bash +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + function InstallPip { python=$1 # Will install pip utility for python - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + if [[ $python == "python2.7" ]]; then + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0" + else + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2" + fi sudo "$python" get-pip.py rm get-pip.py } -- cgit v1.2.3