diff --git a/README.md b/README.md index 6a8fe74..1a9f7d7 100644 --- a/README.md +++ b/README.md @@ -76,3 +76,13 @@ Make sure you use the `actions/checkout@v2` action! GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PACKAGEJSON_DIR: 'frontend' ``` + +**TARGET-BRANCH:** Set a custom target branch to use when bumping the version. Useful in cases such as updating the version on master after a tag has been set (optional). Example: +```yaml +- name: 'Automated Version Bump' + uses: 'phips28/gh-action-bump-version@master' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + target-branch: 'master' +``` diff --git a/action.yml b/action.yml index 09b163b..06a65e3 100644 --- a/action.yml +++ b/action.yml @@ -31,6 +31,10 @@ inputs: description: 'Custom dir to the package' default: '' required: false + target-branch: + description: 'A separate branch to perform the version bump on' + default: '' + required: false default: description: 'Set a default version bump to use' default: 'patch' diff --git a/index.js b/index.js index a2affab..9d799f4 100644 --- a/index.js +++ b/index.js @@ -29,7 +29,7 @@ Toolkit.run(async tools => { const majorWords = process.env['INPUT_MAJOR-WORDING'].split(',') const minorWords = process.env['INPUT_MINOR-WORDING'].split(',') const preReleaseWords = process.env['INPUT_RC-WORDING'].split(',') - + // if patch words aren't specified, any commit message qualifies as a patch const patchWords = process.env['INPUT_PATCH-WORDING'] ? process.env['INPUT_PATCH-WORDING'].split(',') : null @@ -78,6 +78,10 @@ Toolkit.run(async tools => { currentBranch = process.env.GITHUB_HEAD_REF isPullRequest = true } + if (process.env['INPUT_TARGET-BRANCH']) { + // We want to override the branch that we are pulling / pushing to + currentBranch = process.env['INPUT_TARGET-BRANCH'] + } console.log('currentBranch:', currentBranch) // do it in the current checked out github branch (DETACHED HEAD) // important for further usage of the package.json version