Merge branch 'master' into master

This commit is contained in:
Phil 2021-07-02 10:16:12 +02:00 committed by GitHub
commit 2c07aca935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 22 deletions

View File

@ -1,36 +1,36 @@
name: "Bump Version"
name: 'Bump Version'
on:
push:
branches:
- "master"
- 'master'
jobs:
bump-version:
name: "Bump Version on master"
name: 'Bump Version on master'
runs-on: ubuntu-latest
steps:
- name: "Checkout source code"
uses: "actions/checkout@v2"
- name: 'Checkout source code'
uses: 'actions/checkout@v2'
with:
ref: ${{ github.ref }}
- name: "cat package.json"
- name: 'cat package.json'
run: cat ./package.json
- name: "Setup Node.js"
uses: "actions/setup-node@v1"
- name: 'Setup Node.js'
uses: 'actions/setup-node@v1'
with:
node-version: 12
- name: "Automated Version Bump"
- name: 'Automated Version Bump'
id: version-bump
uses: "phips28/gh-action-bump-version@master"
uses: 'phips28/gh-action-bump-version@master'
with:
tag-prefix: 'v'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "cat package.json"
- name: 'cat package.json'
run: cat ./package.json
- name: 'Output Step'
- name: 'Output Step'
env:
NEW_TAG: ${{ steps.version-bump.outputs.newTag }}
run: echo "new tag $NEW_TAG"

View File

@ -31,7 +31,7 @@ Make sure you use the `actions/checkout@v2` action!
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag-prefix: ''
tag-prefix: 'v'
```
**skip-tag:** The tag is not added to the git repository (optional). Example:
@ -106,4 +106,4 @@ Make sure you use the `actions/checkout@v2` action!
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
commit-message: 'CI: bumps version to {{version}} [skip ci]'
```
```

View File

@ -18,11 +18,14 @@ inputs:
major-wording:
description: 'Words list that trigger a major version bump'
default: 'BREAKING CHANGE,major'
required: false
patch-wording:
description: 'Words list that trigger a patch version bump'
required: false
rc-wording:
description: 'Words list that trigger a patch version bump'
description: 'Words list that trigger a rc version bump'
default: 'pre-alpha,pre-beta,pre-rc'
required: false
skip-tag:
description: 'Avoid to add a TAG to the version update commit'
default: 'false'

14
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "gh-action-bump-version",
"version": "8.2.14",
"version": "8.2.20",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -3464,9 +3464,9 @@
}
},
"glob-parent": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"dev": true,
"requires": {
"is-glob": "^4.0.1"
@ -7932,9 +7932,9 @@
}
},
"ws": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
"integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==",
"version": "7.5.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz",
"integrity": "sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow==",
"dev": true
},
"xml-name-validator": {