Skip to content

Commit

Permalink
Remove no-longer-required brew update from CI commands
Browse files Browse the repository at this point in the history
We added this back in the day to address a Bintray issue that prevented
Homebrew from installing dependencies. See
3a1c00c and
#16373

The fix hasn't been required for a long time but the operation never
gave us any trouble until some weeks ago, see
78fcc6f.

Now it's a good time to go back and cleanup.
  • Loading branch information
mokagio committed Mar 14, 2023
1 parent 4d007ba commit 60c2dcf
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 104 deletions.
3 changes: 1 addition & 2 deletions .buildkite/commands/prototype-build-jetpack.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash -eu

# FIXIT-13.1: Prototype Builds want the latest version of Sentry CLI
brew update
# Sentry CLI needs to be up-to-date
brew upgrade sentry-cli

echo "--- :rubygems: Setting up Gems"
Expand Down
3 changes: 1 addition & 2 deletions .buildkite/commands/prototype-build-wordpress.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash -eu

# FIXIT-13.1: Prototype Builds want the latest version of Sentry CLI
brew update
# Sentry CLI needs to be up-to-date
brew upgrade sentry-cli

echo "--- :rubygems: Setting up Gems"
Expand Down
35 changes: 1 addition & 34 deletions .buildkite/commands/release-build-jetpack.sh
Original file line number Diff line number Diff line change
@@ -1,41 +1,8 @@
#!/bin/bash -eu

echo "--- :arrow_down: Installing Release Dependencies"
# Disabled to hopefully work past the failure seen in
# https://buildkite.com/automattic/wordpress-ios/builds/12513#01865ef3-8a38-4303-b028-bead44ee943d
#
# ==> Installing [email protected]
# ==> Pouring [email protected]
# Error: The `brew link` step did not complete successfully
# The formula built, but is not symlinked into /usr/local
# Could not symlink bin/2to3
# Target /usr/local/bin/2to3
# is a symlink belonging to [email protected]. You can unlink it:
# brew unlink [email protected]
#
# To force the link and overwrite all conflicting files:
# brew link --overwrite [email protected]
#
# To list all files that would be deleted:
# brew link --overwrite --dry-run [email protected]
#
# Possible conflicting files are:
# /usr/local/bin/2to3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/2to3
# /usr/local/bin/idle3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/idle3
# /usr/local/bin/pydoc3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/pydoc3
# /usr/local/bin/python3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/python3
# /usr/local/bin/python3-config -> /usr/local/Cellar/[email protected]/3.10.9/bin/python3-config
# /usr/local/share/man/man1/python3.1 -> /usr/local/Cellar/[email protected]/3.10.9/share/man/man1/python3.1
# /usr/local/lib/pkgconfig/python3-embed.pc -> /usr/local/Cellar/[email protected]/3.10.9/lib/pkgconfig/python3-embed.pc
# /usr/local/lib/pkgconfig/python3.pc -> /usr/local/Cellar/[email protected]/3.10.9/lib/pkgconfig/python3.pc
# /usr/local/Frameworks/Python.framework/Headers -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Headers
# /usr/local/Frameworks/Python.framework/Python -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Python
# /usr/local/Frameworks/Python.framework/Resources -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Resources
# /usr/local/Frameworks/Python.framework/Versions/Current -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Versions/Current
#
# brew update # Update homebrew to temporarily fix a bintray issue
brew install imagemagick
brew install ghostscript
# Sentry CLI needs to be up-to-date
brew upgrade sentry-cli

echo "--- :rubygems: Setting up Gems"
Expand Down
34 changes: 1 addition & 33 deletions .buildkite/commands/release-build-wordpress-internal.sh
Original file line number Diff line number Diff line change
@@ -1,41 +1,9 @@
#!/bin/bash -eu

echo "--- :arrow_down: Installing Release Dependencies"
# Disabled to hopefully work past the failure seen in
# https://buildkite.com/automattic/wordpress-ios/builds/12513#01865ef3-8a38-4303-b028-bead44ee943d
#
# ==> Installing [email protected]
# ==> Pouring [email protected]
# Error: The `brew link` step did not complete successfully
# The formula built, but is not symlinked into /usr/local
# Could not symlink bin/2to3
# Target /usr/local/bin/2to3
# is a symlink belonging to [email protected]. You can unlink it:
# brew unlink [email protected]
#
# To force the link and overwrite all conflicting files:
# brew link --overwrite [email protected]
#
# To list all files that would be deleted:
# brew link --overwrite --dry-run [email protected]
#
# Possible conflicting files are:
# /usr/local/bin/2to3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/2to3
# /usr/local/bin/idle3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/idle3
# /usr/local/bin/pydoc3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/pydoc3
# /usr/local/bin/python3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/python3
# /usr/local/bin/python3-config -> /usr/local/Cellar/[email protected]/3.10.9/bin/python3-config
# /usr/local/share/man/man1/python3.1 -> /usr/local/Cellar/[email protected]/3.10.9/share/man/man1/python3.1
# /usr/local/lib/pkgconfig/python3-embed.pc -> /usr/local/Cellar/[email protected]/3.10.9/lib/pkgconfig/python3-embed.pc
# /usr/local/lib/pkgconfig/python3.pc -> /usr/local/Cellar/[email protected]/3.10.9/lib/pkgconfig/python3.pc
# /usr/local/Frameworks/Python.framework/Headers -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Headers
# /usr/local/Frameworks/Python.framework/Python -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Python
# /usr/local/Frameworks/Python.framework/Resources -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Resources
# /usr/local/Frameworks/Python.framework/Versions/Current -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Versions/Current
#
# brew update # Update homebrew to temporarily fix a bintray issue
brew install imagemagick
brew install ghostscript
# Sentry CLI needs to be up-to-date
brew upgrade sentry-cli

echo "--- :rubygems: Setting up Gems"
Expand Down
34 changes: 1 addition & 33 deletions .buildkite/commands/release-build-wordpress.sh
Original file line number Diff line number Diff line change
@@ -1,41 +1,9 @@
#!/bin/bash -eu

echo "--- :arrow_down: Installing Release Dependencies"
# Disabled to hopefully work past the failure seen in
# https://buildkite.com/automattic/wordpress-ios/builds/12513#01865ef3-8a38-4303-b028-bead44ee943d
#
# ==> Installing [email protected]
# ==> Pouring [email protected]
# Error: The `brew link` step did not complete successfully
# The formula built, but is not symlinked into /usr/local
# Could not symlink bin/2to3
# Target /usr/local/bin/2to3
# is a symlink belonging to [email protected]. You can unlink it:
# brew unlink [email protected]
#
# To force the link and overwrite all conflicting files:
# brew link --overwrite [email protected]
#
# To list all files that would be deleted:
# brew link --overwrite --dry-run [email protected]
#
# Possible conflicting files are:
# /usr/local/bin/2to3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/2to3
# /usr/local/bin/idle3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/idle3
# /usr/local/bin/pydoc3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/pydoc3
# /usr/local/bin/python3 -> /usr/local/Cellar/[email protected]/3.10.9/bin/python3
# /usr/local/bin/python3-config -> /usr/local/Cellar/[email protected]/3.10.9/bin/python3-config
# /usr/local/share/man/man1/python3.1 -> /usr/local/Cellar/[email protected]/3.10.9/share/man/man1/python3.1
# /usr/local/lib/pkgconfig/python3-embed.pc -> /usr/local/Cellar/[email protected]/3.10.9/lib/pkgconfig/python3-embed.pc
# /usr/local/lib/pkgconfig/python3.pc -> /usr/local/Cellar/[email protected]/3.10.9/lib/pkgconfig/python3.pc
# /usr/local/Frameworks/Python.framework/Headers -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Headers
# /usr/local/Frameworks/Python.framework/Python -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Python
# /usr/local/Frameworks/Python.framework/Resources -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Resources
# /usr/local/Frameworks/Python.framework/Versions/Current -> /usr/local/Cellar/[email protected]/3.10.9/Frameworks/Python.framework/Versions/Current
#
# brew update # Update homebrew to temporarily fix a bintray issue
brew install imagemagick
brew install ghostscript
# Sentry CLI needs to be up-to-date
brew upgrade sentry-cli

echo "--- :rubygems: Setting up Gems"
Expand Down

0 comments on commit 60c2dcf

Please sign in to comment.