diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index ffacd90e..62cf0408 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -56,7 +56,7 @@ jobs: if [[ "$(git rev-parse "origin/$BRANCH")" != $GITHUB_SHA ]]; then # Normal build on a branch (no tag) - echo "::debug::BRANCH: $BRANCH" + echo "::debug::BRANCH: $BRANCH $(git rev-parse origin/$BRANCH)" echo "::debug::GITHUB_SHA: $GITHUB_SHA" echo "::error::$BRANCH has been updated since build started. Aborting changelog." exit 1 @@ -130,7 +130,7 @@ jobs: echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> $GITHUB_ENV - name: Commit - if: env.SOMETHING_CHANGED + if: env.SOMETHING_CHANGED == 'true' run: | git config user.email "jrnl.bot@gmail.com" git config user.name "Jrnl Bot" diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8e2c8b..70210c26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## [Unreleased](https://github.com/jrnl-org/jrnl/) +## [v2.6-beta2](https://pypi.org/project/jrnl/v2.6-beta2/) (2020-12-19) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...HEAD) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...v2.6-beta2) **Fixed bugs:**