Skip to content

Commit

Permalink
Merge pull request #93 from Dontrian/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Dontrian authored Dec 6, 2023
2 parents 823780d + 7db964b commit 51abf40
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/version-bump-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ jobs:

- name: Automated Version Bump
uses: phips28/[email protected]

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
token: ${{ secrets.VERSION_BUMPER_PAT }}
version-type: 'minor'
target-branch: 'master'
commit-message: 'CI: bumped version to {{version}} because a pull request was merged into master'

merge-master-into-develop:
needs: bump-minor-version-on-master # has to eb run after version has been bumped
needs: bump-minor-version-on-master # has to be run after version has been bumped
if: github.event.pull_request.merged == true
name: Merge master into develop

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.16.9"
"version": "0.16.10"
}

0 comments on commit 51abf40

Please sign in to comment.