From f19c0f8d76b7f791544da77af906d65e1aba501c Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 8 Jul 2020 20:24:26 -0700 Subject: [PATCH 1/2] Workaround missing pip3 on brew Provide direct path to pip3 in case it is not linked to /usr/local/bin Workaround until the following is merged: https://github.com/Homebrew/homebrew-core/pull/57654 Signed-off-by: Steve Peters --- .../lib/project-default-devel-homebrew-amd64.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index 186429fa3..2934143e1 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -78,7 +78,11 @@ fi if [[ -n "${PIP_PACKAGES_NEEDED}" ]]; then brew install python - pip3 install ${PIP_PACKAGES_NEEDED} + PIP=pip3 + if ! which ${PIP} + PIP=/usr/local/opt/python/bin/pip3 + fi + ${PIP} install ${PIP_PACKAGES_NEEDED} fi if [[ -z "${DISABLE_CCACHE}" ]]; then From 101ddfac60d0460b8c0341c2649e5fd57d68c7d9 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 8 Jul 2020 22:34:58 -0700 Subject: [PATCH 2/2] fix syntax --- jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index 2934143e1..94f8e08fc 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -79,7 +79,7 @@ fi if [[ -n "${PIP_PACKAGES_NEEDED}" ]]; then brew install python PIP=pip3 - if ! which ${PIP} + if ! which ${PIP}; then PIP=/usr/local/opt/python/bin/pip3 fi ${PIP} install ${PIP_PACKAGES_NEEDED}