From a87679d3097e4c9f1c536f94a700b88900387c33 Mon Sep 17 00:00:00 2001 From: Henry Bley-Vroman Date: Mon, 20 Feb 2023 17:16:56 -1000 Subject: [PATCH 1/4] feat(actions): publishing releases automatically bumps homebrew --- .github/workflows/publish-release.yaml | 37 ++++++++++++++++++++++++++ docs/releasing.md | 12 ++------- 2 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/publish-release.yaml diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml new file mode 100644 index 00000000..b25371c4 --- /dev/null +++ b/.github/workflows/publish-release.yaml @@ -0,0 +1,37 @@ +name: Release + +on: + release: + types: [published] +jobs: + homebrew: + name: Bump Homebrew formula + runs-on: ubuntu-latest + steps: + - name: Bump v5.x formula + uses: mislav/bump-homebrew-formula-action@v2.2 + if: "contains(github.ref, 'v5')" + with: + formula-name: zsh-abbr + formula-path: zsh-abbr.rb + homebrew-tap: olets/homebrew-tap + commit-message: | + feat({{formulaName}}): publish {{version}} + + Created by https://github.com/mislav/bump-homebrew-formula-action + env: + COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }} + + - name: Bump v4.x formula + uses: mislav/bump-homebrew-formula-action@v2.2 + if: "contains(github.ref, 'v4')" + with: + formula-name: zsh-abbr@4 + formula-path: zsh-abbr@4.rb + homebrew-tap: olets/homebrew-tap + commit-message: | + feat({{formulaName}}): publish {{version}} + + Created by https://github.com/mislav/bump-homebrew-formula-action + env: + COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }} \ No newline at end of file diff --git a/docs/releasing.md b/docs/releasing.md index 564947ba..7dc16f1f 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -16,12 +16,11 @@ The process for cutting new releases. ``` 1. Tag the release. Run (replacing `` with the tag, `v`-prefixed semver) ```shell - git tagit + git tag ``` 1. Update overall trunk branches. Run ```shell git push - git checkout master git merge main git push ``` @@ -46,16 +45,9 @@ The process for cutting new releases. ```shell git push origin ``` -1. On GitHub cut a new release at the tag. Use the form of existing release notes, replacing the version number, SHA, and CHANGELOG URL. Attach the release binary generated by `git-tagit`. +1. On GitHub cut a new release at the tag. Use the form of existing release notes, replacing the version number, SHA, and CHANGELOG URL. The appropriate formula will automatically update. 1. If the change is to a prerelease, update the Homebrew formula's HEAD branch. Run ```shell git checkout next git merge # e.g. git merge v5 ``` -1. Update Homebrew: - - If the change is _not_ a prerelease, and bumps the stable version, update [the stable version Homebrew formula](https://github.com/olets/homebrew-tap/blob/main/zsh-abbr.rb): - - update the `url` with the new version number - - update the `sha256` with the binary's SHA - - If the change is _not_ a prerelease, and bumps v4, update [the v4.x Homebrew formula](https://github.com/olets/homebrew-tap/blob/main/zsh-abbr%404.rb): - - update the `url` with the new version number - - update the `sha256` with the binary's SHA From 8c91004361e0a245993fa607331afba4b22cd98e Mon Sep 17 00:00:00 2001 From: Henry Bley-Vroman Date: Mon, 20 Feb 2023 17:23:06 -1000 Subject: [PATCH 2/4] chore(bump): bump to v4.9.3, update changelog --- CHANGELOG.md | 10 ++++++++++ man/man1/abbr.1 | 2 +- zsh-abbr.zsh | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a191ae6..bd913fc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [4.9.3](https://github.com/olets/zsh-abbr/compare/v4.9.2...4.9.3) (2023-02-21) + + +### Features + +* **actions:** publishing releases automatically bumps homebrew ([a87679d](https://github.com/olets/zsh-abbr/commit/a87679d3097e4c9f1c536f94a700b88900387c33)) +* **bench:** add configs ([4277de1](https://github.com/olets/zsh-abbr/commit/4277de1dec3726527c50c59376fc2fa4fa822f9d)) + + + # [4.9.2](https://github.com/olets/zsh-abbr/compare/v4.9.1...v4.9.2) (2023-02-10) diff --git a/man/man1/abbr.1 b/man/man1/abbr.1 index 40c90915..01ac7a56 100644 --- a/man/man1/abbr.1 +++ b/man/man1/abbr.1 @@ -1,4 +1,4 @@ -.TH "ZSH-ABBR" 1 "February 10 2023" "abbr 4.9.2" "User Commands" +.TH "ZSH-ABBR" 1 "February 20 2023" "abbr 4.9.3" "User Commands" .SH NAME zsh\-abbr \- manage zsh abbreviations .SH SYNOPSIS diff --git a/zsh-abbr.zsh b/zsh-abbr.zsh index 40ea3cec..2c6a6eaa 100755 --- a/zsh-abbr.zsh +++ b/zsh-abbr.zsh @@ -1,6 +1,6 @@ # abbreviation management for zsh, inspired by fish shell and enhanced # https://github.com/olets/zsh-abbr -# v4.9.2 +# v4.9.3 # Copyright (c) 2019-present Henry Bley-Vroman @@ -68,7 +68,7 @@ _abbr() { quiet=$(( ABBR_QUIETER || ABBR_QUIET )) quieter=$ABBR_QUIETER release_date="December 28 2022" - version="zsh-abbr version 4.9.2" + version="zsh-abbr version 4.9.3" # Deprecation notices for values that could be meaningfully set after initialization # Example form: From bbcea630ad91b8f9bbf6784fc7ce237eb52f08b8 Mon Sep 17 00:00:00 2001 From: Henry Bley-Vroman Date: Mon, 20 Feb 2023 17:31:19 -1000 Subject: [PATCH 3/4] chore(release date): update --- zsh-abbr.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh-abbr.zsh b/zsh-abbr.zsh index 2c6a6eaa..32ef4b6e 100755 --- a/zsh-abbr.zsh +++ b/zsh-abbr.zsh @@ -67,7 +67,7 @@ _abbr() { quiet=$ABBR_QUIET quiet=$(( ABBR_QUIETER || ABBR_QUIET )) quieter=$ABBR_QUIETER - release_date="December 28 2022" + release_date="February 20 2023" version="zsh-abbr version 4.9.3" # Deprecation notices for values that could be meaningfully set after initialization From 9e9707beaf67e65f061c48e46b190d7ebf35994c Mon Sep 17 00:00:00 2001 From: Henry Bley-Vroman Date: Mon, 20 Feb 2023 17:33:30 -1000 Subject: [PATCH 4/4] chore(bump): bump to v4.9.4, update changelog --- CHANGELOG.md | 4 ++++ man/man1/abbr.1 | 2 +- zsh-abbr.zsh | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd913fc1..13eb2643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# [4.9.4](https://github.com/olets/zsh-abbr/compare/v4.9.3...v4.9.4) (2023-02-21) + +Update release date + # [4.9.3](https://github.com/olets/zsh-abbr/compare/v4.9.2...4.9.3) (2023-02-21) diff --git a/man/man1/abbr.1 b/man/man1/abbr.1 index 01ac7a56..f8450c32 100644 --- a/man/man1/abbr.1 +++ b/man/man1/abbr.1 @@ -1,4 +1,4 @@ -.TH "ZSH-ABBR" 1 "February 20 2023" "abbr 4.9.3" "User Commands" +.TH "ZSH-ABBR" 1 "February 20 2023" "abbr 4.9.4" "User Commands" .SH NAME zsh\-abbr \- manage zsh abbreviations .SH SYNOPSIS diff --git a/zsh-abbr.zsh b/zsh-abbr.zsh index 32ef4b6e..f57e763a 100755 --- a/zsh-abbr.zsh +++ b/zsh-abbr.zsh @@ -1,6 +1,6 @@ # abbreviation management for zsh, inspired by fish shell and enhanced # https://github.com/olets/zsh-abbr -# v4.9.3 +# v4.9.4 # Copyright (c) 2019-present Henry Bley-Vroman @@ -68,7 +68,7 @@ _abbr() { quiet=$(( ABBR_QUIETER || ABBR_QUIET )) quieter=$ABBR_QUIETER release_date="February 20 2023" - version="zsh-abbr version 4.9.3" + version="zsh-abbr version 4.9.4" # Deprecation notices for values that could be meaningfully set after initialization # Example form: