From 8a73b11cafa72531cae7af257a15e5123f89b0dc Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Tue, 10 Sep 2019 03:20:32 +0000 Subject: [PATCH] fix: back out checkin --- merge-release-run.js | 8 +------- package.json | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/merge-release-run.js b/merge-release-run.js index fb2efb2..69f0f60 100644 --- a/merge-release-run.js +++ b/merge-release-run.js @@ -52,19 +52,13 @@ const run = async () => { const exec = str => process.stdout.write(execSync(str)) - exec(`git checkout -b tmp`) - let current = execSync(`npm view ${pkg.name} version`).toString() exec(`npm version --allow-same-version=true --git-tag-version=false ${current} `) console.log('current:', current, '/', 'version:', version) let newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString() 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(`git push merge-release master`) + exec(`git checkout package.json`) // cleanup exec(`git tag ${newVersion}`) exec(`git push merge-release --tags`) } diff --git a/package.json b/package.json index a5e3609..ef897e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "merge-release", - "version": "4.0.5", + "version": "0.0.0-dev", "description": "", "scripts": { "test": "standard"