From e116a95e34251e4b0963e7b9f6065d44c0de2f54 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 20 Mar 2021 13:08:59 -0700 Subject: [PATCH 1/5] Change PR steps for brew release The hub cli tool wasn't working anymore, so we took it out. Co-authored-by: Micah Jerome Ellison --- .github/workflows/release.yaml | 61 +++++++++++----------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 32912a9f..1631f901 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -127,7 +127,7 @@ jobs: echo "JRNL_VERSION=$JRNL_VERSION" >> $GITHUB_ENV echo "PYPI_VERSION=$PYPI_VERSION" >> $GITHUB_ENV - - name: Determine type of release + - name: Set env variables env: REPO_OWNER: ${{ github.repository_owner }} run: | @@ -158,24 +158,6 @@ jobs: echo '::debug::Set tap directory' echo "BREW_TAP_DIRECTORY='$(brew --repository)/Library/Taps/${FORMULA_REPO}'" >> $GITHUB_ENV - - name: Config git user - working-directory: ${{ env.BREW_TAP_DIRECTORY }} - run: | - git config --local user.name "${{ secrets.JRNL_BOT_NAME }}" - git config --local user.email "${{ secrets.JRNL_BOT_EMAIL }}" - - - name: Create branch - working-directory: ${{ env.BREW_TAP_DIRECTORY }} - run: | - BRANCH_NAME="jrnl-${JRNL_VERSION}--${RANDOM}" - git remote rename origin upstream - git remote add origin "https://${{ secrets.JRNL_BOT_NAME }}:${{ secrets.JRNL_BOT_TOKEN }}@github.com/${BOT_REPO}.git" - - git fetch upstream - git fetch origin - git checkout -b $BRANCH_NAME - git push -u origin $BRANCH_NAME - - name: Install dependencies run: brew install pipgrip @@ -210,29 +192,26 @@ jobs: --version=$PYPI_VERSION --no-audit --write - --commit --force - --verbose - - name: Update commit message - working-directory: ${{ env.BREW_TAP_DIRECTORY }} - run: | - git commit --amend \ - -m "jrnl ${JRNL_VERSION}" \ - -m "Update jrnl to ${JRNL_VERSION}" \ - -m '${{ secrets.RELEASE_COAUTHORS }}' + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 + with: + path: ${{ env.BREW_TAP_DIRECTORY }} + token: ${{ secrets.JRNL_BOT_TOKEN }} + push-to-fork: ${{ env.BOT_REPO }} - - name: Push commit - working-directory: ${{ env.BREW_TAP_DIRECTORY }} - run: | - git show head - git push + committer: ${{ secrets.JRNL_BOT_NAME }} <${{ secrets.JRNL_BOT_EMAIL }}> + author: ${{ secrets.JRNL_BOT_NAME }} <${{ secrets.JRNL_BOT_EMAIL }}> - - name: Open pull request - working-directory: ${{ env.BREW_TAP_DIRECTORY }} - env: - GH_TOKEN: ${{ secrets.JRNL_BOT_TOKEN }} - run: > - gh pr create - --title "jrnl ${JRNL_VERSION}" - --body 'Created with `brew bump-formula-pr`.' + title: jrnl ${{ env.JRNL_VERSION }} + body: Created with `brew bump-formula-pr` + + branch: jrnl-${{ env.JRNL_VERSION }}-- + branch-suffix: random + commit-message: | + jrnl ${{ env.JRNL_VERSION }} + + Update jrnl to ${{ env.JRNL_VERSION }} + + ${{ secrets.RELEASE_COAUTHORS }} From eb0c694cc83f52c208381f967447ec4700b9f366 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 20 Mar 2021 21:15:38 +0000 Subject: [PATCH 2/5] Update changelog [ci skip] --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17059d78..ca2f5a8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [Unreleased](https://github.com/jrnl-org/jrnl/) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8-beta...HEAD) + +**Implemented enhancements:** + +- Assigning a number to each entry when viewing [\#1218](https://github.com/jrnl-org/jrnl/issues/1218) + +**Packaging:** + +- Bump pyflakes from 2.2.0 to 2.3.0 [\#1215](https://github.com/jrnl-org/jrnl/pull/1215) ([dependabot[bot]](https://github.com/apps/dependabot)) + ## [v2.8-beta](https://pypi.org/project/jrnl/v2.8-beta/) (2021-03-13) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.7.2-beta...HEAD) From dc95b4c0988a6262a353d9dbbcc01685ce470f3c Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 27 Mar 2021 19:24:06 +0000 Subject: [PATCH 3/5] Increment version to v2.8 --- jrnl/__version__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jrnl/__version__.py b/jrnl/__version__.py index 790c604a..d01f99f3 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1 +1 @@ -__version__ = "v2.8-beta" +__version__ = "v2.8" diff --git a/pyproject.toml b/pyproject.toml index 32018559..56773289 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.8-beta" +version = "v2.8" description = "Collect your thoughts and notes without leaving the command line." authors = [ "jrnl contributors ", From 50c053cf56027302062ceb1ad62cad86c8babc3e Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 27 Mar 2021 19:25:37 +0000 Subject: [PATCH 4/5] Update changelog [ci skip] --- CHANGELOG.md | 53 ++++++++++++---------------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca2f5a8b..607f4e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,54 +1,25 @@ # Changelog -## [Unreleased](https://github.com/jrnl-org/jrnl/) +## [v2.8](https://pypi.org/project/jrnl/v2.8/) (2021-03-27) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8-beta...HEAD) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8-beta...v2.8) **Implemented enhancements:** -- Assigning a number to each entry when viewing [\#1218](https://github.com/jrnl-org/jrnl/issues/1218) +- Add `--config-override` feature [\#1169](https://github.com/jrnl-org/jrnl/pull/1169) ([sriniv27](https://github.com/sriniv27)) + +**Fixed bugs:** + +- Fix bug that prevented --format pretty and --format short from working [\#1177](https://github.com/jrnl-org/jrnl/pull/1177) ([sriniv27](https://github.com/sriniv27)) + +**Build:** + +- Fix broken brew release process [\#1211](https://github.com/jrnl-org/jrnl/pull/1211) ([micahellison](https://github.com/micahellison)) **Packaging:** - Bump pyflakes from 2.2.0 to 2.3.0 [\#1215](https://github.com/jrnl-org/jrnl/pull/1215) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [v2.8-beta](https://pypi.org/project/jrnl/v2.8-beta/) (2021-03-13) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.7.2-beta...HEAD) - -**Implemented enhancements:** - -- Add pypi project links [\#1197](https://github.com/jrnl-org/jrnl/issues/1197) -- Add `--config-override` feature [\#1169](https://github.com/jrnl-org/jrnl/pull/1169) ([sriniv27](https://github.com/sriniv27)) - -**Fixed bugs:** - -- bash: syntax error near unexpected token `newline' at input \>\_\> [\#1208](https://github.com/jrnl-org/jrnl/issues/1208) -- `jrnl --format short` returns an error [\#1173](https://github.com/jrnl-org/jrnl/issues/1173) -- `jrnl --format pretty` returns an error [\#1172](https://github.com/jrnl-org/jrnl/issues/1172) -- Fix bug that prevented --format pretty and --format short from working [\#1177](https://github.com/jrnl-org/jrnl/pull/1177) ([sriniv27](https://github.com/sriniv27)) - -**Packaging:** - -- Bump keyring from 22.0.1 to 22.3.0 [\#1210](https://github.com/jrnl-org/jrnl/pull/1210) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump asteval from 0.9.22 to 0.9.23 [\#1209](https://github.com/jrnl-org/jrnl/pull/1209) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [v2.7.2-beta](https://pypi.org/project/jrnl/v2.7.2-beta/) (2021-03-06) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.7.1...v2.7.2-beta) - -**Implemented enhancements:** - -- Add pypi project links [\#1197](https://github.com/jrnl-org/jrnl/issues/1197) -- Add `--config-override` feature [\#1169](https://github.com/jrnl-org/jrnl/pull/1169) ([sriniv27](https://github.com/sriniv27)) - -**Fixed bugs:** - -- bash: syntax error near unexpected token `newline' at input \>\_\> [\#1208](https://github.com/jrnl-org/jrnl/issues/1208) -- `jrnl --format short` returns an error [\#1173](https://github.com/jrnl-org/jrnl/issues/1173) -- `jrnl --format pretty` returns an error [\#1172](https://github.com/jrnl-org/jrnl/issues/1172) -- Fix bug that prevented --format pretty and --format short from working [\#1177](https://github.com/jrnl-org/jrnl/pull/1177) ([sriniv27](https://github.com/sriniv27)) - -**Packaging:** - +- Bump keyring from 22.3.0 to 23.0.0 [\#1213](https://github.com/jrnl-org/jrnl/pull/1213) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump keyring from 22.0.1 to 22.3.0 [\#1210](https://github.com/jrnl-org/jrnl/pull/1210) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump asteval from 0.9.22 to 0.9.23 [\#1209](https://github.com/jrnl-org/jrnl/pull/1209) ([dependabot[bot]](https://github.com/apps/dependabot)) From 09bcfa2242c4b667986bcf62906eae473884b342 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 27 Mar 2021 13:11:42 -0700 Subject: [PATCH 5/5] Update brew tap for release pipeline This was left out of a previous commit. Co-authored-by: Micah Jerome Ellison --- .github/workflows/release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1631f901..3e4987e9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -156,8 +156,7 @@ jobs: run: | brew tap ${FORMULA_REPO} echo '::debug::Set tap directory' - echo "BREW_TAP_DIRECTORY='$(brew --repository)/Library/Taps/${FORMULA_REPO}'" >> $GITHUB_ENV - + echo "BREW_TAP_DIRECTORY=$(brew --repo ${FORMULA_REPO})" >> $GITHUB_ENV - name: Install dependencies run: brew install pipgrip