From aefbd077263205b0484b813ca07a1069843a6e89 Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Tue, 10 Sep 2019 02:37:12 +0000 Subject: [PATCH] fix: changing branchname --- entrypoint.sh | 5 +---- merge-release-run.js | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 804b1b1..e3ae408 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -23,10 +23,7 @@ remote_repo="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSIT 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 checkout master -git push -u origin +git remote add merge-release "${remote_repo}" if [ "$GITHUB_REPOSITORY" = "mikeal/merge-release" ] then diff --git a/merge-release-run.js b/merge-release-run.js index ca8ed6e..5e630e3 100644 --- a/merge-release-run.js +++ b/merge-release-run.js @@ -63,8 +63,8 @@ const run = async () => { exec(`git checkout master`) exec(`git merge tmp`) exec(`npm publish --access=public`) - exec(`git push origin master`) + exec(`git push merge-release master`) exec(`git tag ${newVersion}`) - exec(`git push origin --tags`) + exec(`git push merge-release --tags`) } run()