From 7ad28db367b9828f3f123f4150b272021410060a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Lipski?= Date: Mon, 10 Oct 2022 15:47:00 +0200 Subject: [PATCH] Skip `brew install --build-from-source` after actual deployment (only leave in dry-run mode) (#688) --- RELEASE_NOTES.md | 4 ++++ ci/homebrew/ci-deploy.sh | 20 ++++++++++---------- git_machete/__init__.py | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2f27b3900..95bec1f08 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,9 @@ # Release notes +## New in git-machete 3.12.4 + +- fixed: Homebrew release process + ## New in git-machete 3.12.3 - fixed: release instructions in CONTRIBUTING.md are now correct diff --git a/ci/homebrew/ci-deploy.sh b/ci/homebrew/ci-deploy.sh index 5fa5bbc21..dbff761f3 100644 --- a/ci/homebrew/ci-deploy.sh +++ b/ci/homebrew/ci-deploy.sh @@ -19,8 +19,8 @@ sha256=$( curl -s https://$pypi_host/pypi/git-machete/"$version"/json \ | jq --raw-output '.urls | map(select(.packagetype == "sdist")) | .[0].digests.sha256') -git config user.email "gitmachete@virtuslab.com" -git config user.name "Git Machete Bot" +git config --global user.email "gitmachete@virtuslab.com" +git config --global user.name "Git Machete Bot" echo "Bump homebrew formula" if [[ $do_push == true ]]; then @@ -28,13 +28,13 @@ if [[ $do_push == true ]]; then else echo "Refraining from push since it's a dry run" brew bump-formula-pr --write-only --no-browse --verbose --url "$url" --sha256 "$sha256" git-machete -fi -echo "Install formula locally" -brew install --build-from-source --formula /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/git-machete.rb -if [[ "$version" != "$(git machete --version | cut -d' ' -f4)" ]]; then - echo "Something went wrong during brew installation: installed version does not match version from formula." - echo "Formula version: $version, installed version: $(git machete --version | cut -d' ' -f4)" - exit 1 + echo "Install formula locally" + brew install --build-from-source --formula /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/git-machete.rb + if [[ "$version" != "$(git machete --version | cut -d' ' -f4)" ]]; then + echo "Something went wrong during brew installation: installed version does not match version from formula." + echo "Formula version: $version, installed version: $(git machete --version | cut -d' ' -f4)" + exit 1 + fi + brew remove git-machete fi -brew remove git-machete diff --git a/git_machete/__init__.py b/git_machete/__init__.py index a8ed9f418..befd9a204 100644 --- a/git_machete/__init__.py +++ b/git_machete/__init__.py @@ -1 +1 @@ -__version__ = '3.12.3' +__version__ = '3.12.4'