fix: changing branchname

This commit is contained in:
Mikeal Rogers 2019-09-10 02:37:12 +00:00 committed by Merge Release
parent 161b385fd6
commit 9e61234bd7
3 changed files with 4 additions and 7 deletions

View File

@ -23,10 +23,7 @@ remote_repo="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSIT
git config user.name "Merge Release" git config user.name "Merge Release"
git config user.email "merge-release@users.noreply.github.com" git config user.email "merge-release@users.noreply.github.com"
git remote rm origin git remote add merge-release "${remote_repo}"
git remote add origin "${remote_repo}"
git checkout master
git push -u origin
if [ "$GITHUB_REPOSITORY" = "mikeal/merge-release" ] if [ "$GITHUB_REPOSITORY" = "mikeal/merge-release" ]
then then

View File

@ -63,8 +63,8 @@ const run = async () => {
exec(`git checkout master`) exec(`git checkout master`)
exec(`git merge tmp`) exec(`git merge tmp`)
exec(`npm publish --access=public`) exec(`npm publish --access=public`)
exec(`git push origin master`) exec(`git push merge-release master`)
exec(`git tag ${newVersion}`) exec(`git tag ${newVersion}`)
exec(`git push origin --tags`) exec(`git push merge-release --tags`)
} }
run() run()

View File

@ -1,6 +1,6 @@
{ {
"name": "merge-release", "name": "merge-release",
"version": "4.0.0", "version": "4.0.3",
"description": "", "description": "",
"scripts": { "scripts": {
"test": "standard" "test": "standard"