Force overwrite of Python 3.11/3.12 symlinks

Workaround for Homebrew/homebrew-core#173191
MozillaSecurity · Jun 5, 2024 · d2543a5 · d2543a5
1 parent 8d64c2d
commit d2543a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/services/ci-py-311-osx/setup.sh b/services/ci-py-311-osx/setup.sh
@@ -4,7 +4,7 @@ set -e -x -o pipefail
 retry () { i=0; while [[ "$i" -lt 9 ]]; do if "$@"; then return; else sleep 30; fi; i="${i+1}"; done; "$@"; }
 retry-curl () { curl -sSL --connect-timeout 25 --fail --retry 5 -w "%{stderr}[downloaded %{url_effective}]\n" "$@"; }
 
-retry brew install --force-bottle openssl@3 python@3.11
+retry brew install --force-bottle --overwrite openssl@3 python@3.11
 # shellcheck disable=SC2016
 sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/python@3.11/libexec/bin:${HOMEBREW_PREFIX}/opt/python@3.11/bin:${HOMEBREW_PREFIX}/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/bin:,' homebrew/Library/Homebrew/cmd/shellenv.sh
 PATH="$HOMEBREW_PREFIX/opt/python@3.11/libexec/bin:$HOMEBREW_PREFIX/opt/python@3.11/bin:$HOMEBREW_PREFIX/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/bin:$PATH"

diff --git a/services/ci-py-312-osx/setup.sh b/services/ci-py-312-osx/setup.sh
@@ -4,7 +4,7 @@ set -e -x -o pipefail
 retry () { i=0; while [[ "$i" -lt 9 ]]; do if "$@"; then return; else sleep 30; fi; i="${i+1}"; done; "$@"; }
 retry-curl () { curl -sSL --connect-timeout 25 --fail --retry 5 -w "%{stderr}[downloaded %{url_effective}]\n" "$@"; }
 
-retry brew install --force-bottle openssl@3 python@3.12
+retry brew install --force-bottle --overwrite openssl@3 python@3.12
 # shellcheck disable=SC2016
 sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/python@3.12/libexec/bin:${HOMEBREW_PREFIX}/opt/python@3.12/bin:${HOMEBREW_PREFIX}/opt/python@3.12/Frameworks/Python.framework/Versions/3.12/bin:,' homebrew/Library/Homebrew/cmd/shellenv.sh
 PATH="$HOMEBREW_PREFIX/opt/python@3.12/libexec/bin:$HOMEBREW_PREFIX/opt/python@3.12/bin:$HOMEBREW_PREFIX/opt/python@3.12/Frameworks/Python.framework/Versions/3.12/bin:$PATH"