fix: change branch and tag strategy

entrypoint.sh

@@ -19,14 +19,13 @@ if [ -n "$NPM_AUTH_TOKEN" ]; then
   chmod 0600 "$NPM_CONFIG_USERCONFIG"
 fi
 
-sh -c "git checkout master"
-
 remote_repo="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
 
 git config user.name "Merge Release"
 git config user.email "merge-release@users.noreply.github.com"
 git remote rm origin
 git remote add origin "${remote_repo}"
+git push -u origin
 
 if [ "$GITHUB_REPOSITORY" = "mikeal/merge-release" ]
 then

merge-release-run.js

@@ -52,15 +52,19 @@ const run = async () => {
 
   const exec = str => process.stdout.write(execSync(str))
 
+  exec(`git branch 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(`npm publish --access=public`)
   exec(`git push origin master`)
-  await git.addTag(newVersion)
-  await git.pushTags('origin')
+  exec(`git tag ${newVersion}`)
+  exec(`git push origin --tags`)
 }
 run()