Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json
This commit is contained in:
phips28 2020-04-03 13:10:39 +02:00
commit 6cae8d7997
4 changed files with 5 additions and 4 deletions

View File

@ -12,7 +12,7 @@ jobs:
steps:
- name: "Checkout source code"
uses: "actions/checkout@v1"
uses: "actions/checkout@v2"
with:
ref: ${{ github.ref }}
- name: "cat package.json"
@ -20,7 +20,7 @@ jobs:
- name: "Setup Node.js"
uses: "actions/setup-node@v1"
with:
node-version: 8.10.0
node-version: 12
- name: "Automated Version Bump"
uses: "phips28/gh-action-bump-version@master"
with:

View File

@ -7,6 +7,8 @@ It is meant to be used on every successful merge to master but
you'll need to configured that workflow yourself. You can look to the
[`.github/workflows/push.yml`](./.github/workflows/push.yml) file in this project as an example.
Make sure you use the `actions/checkout@v2` action!
### Workflow
* Based on the commit messages, increment the version from the lastest release.

View File

@ -54,7 +54,6 @@ Toolkit.run(async tools => {
newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString().trim()
newVersion = `${process.env['INPUT_TAG-PREFIX']}${newVersion}`
console.log('new version:', newVersion)
await tools.runInWorkspace('git', ['commit', '-a', '-m', `ci: ${commitMessage} ${newVersion}`])
const remoteRepo = `https://${process.env.GITHUB_ACTOR}:${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git`
// console.log(Buffer.from(remoteRepo).toString('base64'))

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "gh-action-bump-version",
"version": "6.0.2",
"version": "6.0.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {