[macos] Update homebrew

MozillaSecurity · Jun 29, 2023 · b27e8c6 · b27e8c6
1 parent 40c67fe
commit b27e8c6
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/services/ci-py-310-osx/service.yaml b/services/ci-py-310-osx/service.yaml
@@ -1,5 +1,5 @@
 name: ci-py-310-osx
 type: homebrew
-base: https://github.com/Homebrew/brew/archive/refs/tags/3.6.9.tar.gz
+base: https://github.com/Homebrew/brew/archive/refs/tags/4.0.26.tar.gz
 force_dirty:
   - orion-decision
diff --git a/services/ci-py-310-osx/setup.sh b/services/ci-py-310-osx/setup.sh
@@ -4,7 +4,7 @@ set -e -x
 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 "$@"; }
 
-retry brew install --force-bottle openssl@1.1 python@3.10
+retry brew install --force-bottle openssl@3 python@3.10
 # shellcheck disable=SC2016
 sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/python@3.10/libexec/bin:${HOMEBREW_PREFIX}/opt/python@3.10/bin:${HOMEBREW_PREFIX}/opt/python@3.10/Frameworks/Python.framework/Versions/3.10/bin:,' homebrew/Library/Homebrew/cmd/shellenv.sh
 PATH="$HOMEBREW_PREFIX/opt/python@3.10/libexec/bin:$HOMEBREW_PREFIX/opt/python@3.10/bin:$HOMEBREW_PREFIX/opt/python@3.10/Frameworks/Python.framework/Versions/3.10/bin:$PATH"

diff --git a/services/ci-py-38-osx/service.yaml b/services/ci-py-38-osx/service.yaml
@@ -1,5 +1,5 @@
 name: ci-py-38-osx
 type: homebrew
-base: https://github.com/Homebrew/brew/archive/refs/tags/3.6.9.tar.gz
+base: https://github.com/Homebrew/brew/archive/refs/tags/4.0.26.tar.gz
 force_dirty:
   - orion-decision
diff --git a/services/ci-py-38-osx/setup.sh b/services/ci-py-38-osx/setup.sh
@@ -4,7 +4,7 @@ set -e -x
 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 "$@"; }
 
-retry brew install --force-bottle openssl@1.1 python@3.8 tcl-tk
+retry brew install --force-bottle openssl@3 python@3.8 tcl-tk
 # shellcheck disable=SC2016
 sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/python@3.8/libexec/bin:${HOMEBREW_PREFIX}/opt/python@3.8/bin:${HOMEBREW_PREFIX}/opt/python@3.8/Frameworks/Python.framework/Versions/3.8/bin:,' homebrew/Library/Homebrew/cmd/shellenv.sh
 PATH="$HOMEBREW_PREFIX/opt/python@3.8/libexec/bin:$HOMEBREW_PREFIX/opt/python@3.8/bin:$HOMEBREW_PREFIX/opt/python@3.8/Frameworks/Python.framework/Versions/3.8/bin:$PATH"

diff --git a/services/ci-py-39-osx/service.yaml b/services/ci-py-39-osx/service.yaml
@@ -1,5 +1,5 @@
 name: ci-py-39-osx
 type: homebrew
-base: https://github.com/Homebrew/brew/archive/refs/tags/3.6.9.tar.gz
+base: https://github.com/Homebrew/brew/archive/refs/tags/4.0.26.tar.gz
 force_dirty:
   - orion-decision
diff --git a/services/ci-py-39-osx/setup.sh b/services/ci-py-39-osx/setup.sh
@@ -4,7 +4,7 @@ set -e -x
 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 "$@"; }
 
-retry brew install --force-bottle openssl@1.1 python@3.9
+retry brew install --force-bottle openssl@3 python@3.9
 # shellcheck disable=SC2016
 sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/python@3.9/libexec/bin:${HOMEBREW_PREFIX}/opt/python@3.9/bin:${HOMEBREW_PREFIX}/opt/python@3.9/Frameworks/Python.framework/Versions/3.9/bin:,' homebrew/Library/Homebrew/cmd/shellenv.sh
 PATH="$HOMEBREW_PREFIX/opt/python@3.9/libexec/bin:$HOMEBREW_PREFIX/opt/python@3.9/bin:$HOMEBREW_PREFIX/opt/python@3.9/Frameworks/Python.framework/Versions/3.9/bin:$PATH"

diff --git a/services/grizzly-macos/service.yaml b/services/grizzly-macos/service.yaml
@@ -1,5 +1,5 @@
 name: grizzly-macos
 type: homebrew
-base: https://github.com/Homebrew/brew/archive/refs/tags/3.6.11.tar.gz
+base: https://github.com/Homebrew/brew/archive/refs/tags/4.0.26.tar.gz
 force_dirty:
   - fuzzing-decision
diff --git a/services/grizzly-macos/setup.sh b/services/grizzly-macos/setup.sh
@@ -3,7 +3,7 @@ set -e -x
 
 retry_curl () { curl -sSL --connect-timeout 25 --fail --retry 5 "$@"; }
 
-brew install --force-bottle openssl@1.1 python@3.9
+brew install --force-bottle openssl@3 python@3.9
 chmod +w "$HOMEBREW_PREFIX/lib/python3.9/site-packages"
 # shellcheck disable=SC2016
 sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/python@3.9/libexec/bin:${HOMEBREW_PREFIX}/opt/python@3.9/bin:${HOMEBREW_PREFIX}/opt/python@3.9/Frameworks/Python.framework/Versions/3.9/bin:,' "$HOMEBREW_PREFIX/Library/Homebrew/cmd/shellenv.sh"
@@ -13,11 +13,10 @@ brew install --force-bottle p7zip zstd
 brew install --force-bottle fluent-bit
 brew install --force-bottle apr-util gettext subversion
 
-brew install --force-bottle node@14
+brew install --force-bottle node@16
 # shellcheck disable=SC2016
-sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/node@14/bin:,' "$HOMEBREW_PREFIX/Library/Homebrew/cmd/shellenv.sh"
-PATH="$HOMEBREW_PREFIX/opt/node@14/bin:$PATH"
-retry_curl https://www.npmjs.com/install.sh | npm_install="7.24.2" sh
+sed -i '' 's,export PATH=\\",&${HOMEBREW_PREFIX}/opt/node@16/bin:,' "$HOMEBREW_PREFIX/Library/Homebrew/cmd/shellenv.sh"
+PATH="$HOMEBREW_PREFIX/opt/node@16/bin:$PATH"
 
 # configure pip
 mkdir -p pip