fix: back out checkin

This commit is contained in:
Mikeal Rogers 2019-09-10 03:20:32 +00:00
parent f33f9eed76
commit 8a73b11caf
2 changed files with 2 additions and 8 deletions

View File

@ -52,19 +52,13 @@ const run = async () => {
const exec = str => process.stdout.write(execSync(str)) const exec = str => process.stdout.write(execSync(str))
exec(`git checkout -b tmp`)
let current = execSync(`npm view ${pkg.name} version`).toString() let current = execSync(`npm view ${pkg.name} version`).toString()
exec(`npm version --allow-same-version=true --git-tag-version=false ${current} `) exec(`npm version --allow-same-version=true --git-tag-version=false ${current} `)
console.log('current:', current, '/', 'version:', version) console.log('current:', current, '/', 'version:', version)
let newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString() let newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString()
console.log('new version:', newVersion) console.log('new version:', newVersion)
exec(`git commit -a --amend --no-edit`)
exec(`git checkout master`)
exec(`git merge tmp`)
exec(`git commit --amend -m "${newVersion}"`)
exec(`npm publish --access=public`) exec(`npm publish --access=public`)
exec(`git push merge-release master`) exec(`git checkout package.json`) // cleanup
exec(`git tag ${newVersion}`) exec(`git tag ${newVersion}`)
exec(`git push merge-release --tags`) exec(`git push merge-release --tags`)
} }

View File

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