From 3ede84fe25558eb6b38ba07d98fdbdd48d8fa3b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 13:26:02 +0000 Subject: [PATCH 1/2] Dependabot: Bump EndBug/add-and-commit from 7.5.0 to 8 Bumps [EndBug/add-and-commit](https://github.com/EndBug/add-and-commit) from 7.5.0 to 8. - [Release notes](https://github.com/EndBug/add-and-commit/releases) - [Changelog](https://github.com/EndBug/add-and-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/EndBug/add-and-commit/compare/v7.5.0...v8) --- updated-dependencies: - dependency-name: EndBug/add-and-commit dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/PublishRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PublishRelease.yml b/.github/workflows/PublishRelease.yml index 22201d2..4539640 100644 --- a/.github/workflows/PublishRelease.yml +++ b/.github/workflows/PublishRelease.yml @@ -83,7 +83,7 @@ jobs: - name: Commit next dev version id: commit_next_dev - uses: EndBug/add-and-commit@v7.5.0 + uses: EndBug/add-and-commit@v8 with: add: 'gradle.properties' branch: master From 3389c08af3d0ea7df16f87a63cc302ea638ea077 Mon Sep 17 00:00:00 2001 From: Eliezer Graber Date: Fri, 21 Jan 2022 16:36:58 -0500 Subject: [PATCH 2/2] Change branch to master before bumping version --- .github/workflows/PublishRelease.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/PublishRelease.yml b/.github/workflows/PublishRelease.yml index 4539640..87dbb48 100644 --- a/.github/workflows/PublishRelease.yml +++ b/.github/workflows/PublishRelease.yml @@ -77,6 +77,11 @@ jobs: tag: ${{ env.RELEASE_VERSION }} token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v2.4.0 + with: + ref: 'master' + token: ${{ secrets.PUSH_PAT }} + - name: Prepare next dev version id: prepare_next_dev run: sed -i -e 's/${{ env.CURRENT_VERSION }}/${{ env.NEXT_VERSION }}/g' gradle.properties