actions
/
gh-action-bump-version
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: try without squash

This commit is contained in:
Mikeal Rogers 2019-09-10 02:54:54 +00:00 committed by Merge Release
parent 302adad44f
commit cba24fa67e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-release-run.js
View File

@ -61,7 +61,7 @@ const run = async () => {
console.log('new version:', newVersion) console.log('new version:', newVersion)
exec(`git commit -a --amend --no-edit`) exec(`git commit -a --amend --no-edit`)
exec(`git checkout master`) exec(`git checkout master`)
exec(`git merge --squash tmp`) exec(`git merge tmp`)
exec(`git commit --amend -m "${newVersion} published"`) exec(`git commit --amend -m "${newVersion} published"`)
exec(`npm publish --access=public`) exec(`npm publish --access=public`)
exec(`git push merge-release master`) exec(`git push merge-release master`)

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "merge-release", "name": "merge-release",
"version": "4.0.3", "version": "4.0.5",
"description": "", "description": "",
"scripts": { "scripts": {
"test": "standard" "test": "standard"