From dcf6d026632bde9e39fcd32c05b24d67559519d6 Mon Sep 17 00:00:00 2001
From: Mikeal Rogers <mikeal.rogers@gmail.com>
Date: Mon, 9 Sep 2019 21:11:22 +0000
Subject: [PATCH] fix: rolling back

---
 merge-release-run.js | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/merge-release-run.js b/merge-release-run.js
index 65d72b8..6ff4652 100644
--- a/merge-release-run.js
+++ b/merge-release-run.js
@@ -46,32 +46,13 @@ const run = async () => {
     version = 'minor'
   }
 
-  const run = str => process.stdout.write(execSync(str))
+  const runExec = str => process.stdout.write(execSync(str))
 
-  /* configure git */
-  const { GITHUB_ACTOR, GITHUB_TOKEN, GITHUB_REPOSITORY } = process.env
-  const remote = `https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git`
-  console.log({ remote })
-  run(`git remote add publish ${remote}`)
-  run(`git config user.name "Merge Release"`)
-  run(`git config user.email "merge-release@users.noreply.github.com"`)
-
-  console.log('configured')
   let current = execSync(`npm view ${pkg.name} version`).toString()
-  run(`npm version --allow-same-version=true --git-tag-version=false ${current} `)
+  runExec(`npm version --allow-same-version=true --git-tag-version=false ${current} `)
   let newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString()
   console.log(newVersion)
-
-  run(`git commit -a --amend --no-edit`)
-
-  run(`git fetch`)
-  run(`git branch tmp`)
-  run(`git checkout master`)
-  run(`git merge tmp`)
-
-  run(`npm publish --access=public`)
-  run(`git push publish master`)
-  await git.addTag(newVersion)
-  await git.pushTags('publish')
+  runExec(`npm publish --access=public`)
+  runExec(`git checkout package.json`)
 }
 run()