Restore brew tap before brew bump-formula-pr

VirtusLab · Mar 9, 2024 · e23f3e0 · e23f3e0
1 parent 7e64491
commit e23f3e0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release notes
 
+## New in git-machete 3.24.2
+
+- fixed: automatic updates of Homebrew formula
+
 ## New in git-machete 3.24.1
 
 - fixed: deployment issues

diff --git a/ci/homebrew/ci-deploy.sh b/ci/homebrew/ci-deploy.sh
@@ -28,6 +28,12 @@ sha256=$(
   curl -s https://$pypi_host/pypi/git-machete/"$version"/json \
   | jq --raw-output '.urls | map(select(.packagetype == "sdist")) | .[0].digests.sha256')
 
+# We need to run `brew tap homebrew/core` manually because:
+# 1. the formula files need to be present at ~/.linuxbrew/Homebrew/Library/Taps/... - otherwise, `brew bump-formula-pr` will fail due to missing formula AND
+# 2. since Homebrew 4.0.0 it is no longer done by default when installing `brew`; see https://brew.sh/2023/02/16/homebrew-4.0.0/
+# Also, we can't use `--shallow` here (even though it'd save us ~3 minutes), this option is no longer supported (see https://stackoverflow.com/a/65243764).
+brew tap --force homebrew/core
+
 echo "Bump Homebrew formula"
 brew developer on
 if [[ $do_push == true ]]; then
@@ -46,8 +52,10 @@ if [[ $do_push == true ]]; then
   brew bump-formula-pr --force --no-browse --verbose --url "$url" --sha256 "$sha256" git-machete
 else
   echo "Refraining from push since it's a dry run"
-  git clone --depth=1 git@github.com:Homebrew/homebrew-core.git ~/homebrew-core
-  formula_file=~/homebrew-core/Formula/g/git-machete.rb
+  # homebrew-core has been fetched by `brew tap` above
+  formula_file=/home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/g/git-machete.rb
+
+  # TODO (#1198): run `brew bump-formula-pr --write-only` here, rather than patching with `sed`
   sed -i "s!^  url .*\$!  url \"$url\"!"          $formula_file
   sed -i "s!^  sha256 .*\$!  sha256 \"$sha256\"!" $formula_file
 

diff --git a/docs/man/git-machete.1 b/docs/man/git-machete.1
@@ -29,7 +29,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .TH "GIT-MACHETE" "1" "Mar 09, 2024" "" "git-machete"
 .SH NAME
-git-machete \- git-machete 3.24.1
+git-machete \- git-machete 3.24.2
 .sp
 git machete is a robust tool that \fBsimplifies your git workflows\fP\&.
 .sp

diff --git a/git_machete/__init__.py b/git_machete/__init__.py
@@ -1 +1 @@
-__version__ = '3.24.1'
+__version__ = '3.24.2'