Skip to content
This repository has been archived by the owner on Apr 30, 2018. It is now read-only.

Commit

Permalink
fix(build-temp): trying origin...
Browse files Browse the repository at this point in the history
  • Loading branch information
Kent C. Dodds committed Aug 28, 2015
1 parent 8d22337 commit 89bc1d6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/publish-latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ git config --global user.email kent+formly-bot@doddsfamily.us
git config --global user.name formly-bot

echo "setting remote"
git remote add github https://formly-bot:${BOT_GH_TOKEN}@github.com/formly-js/angular-formly.git
git remote set-url origin https://formly-bot:${BOT_GH_TOKEN}@github.com/formly-js/angular-formly.git

echo "merging master"
git merge github/master -m "master merge" -X theirs
git merge origin/master -m "master merge" -X theirs

echo "adding dist"
git add dist package.json
Expand All @@ -23,7 +23,7 @@ echo "tagging with v$F_VERSION"
git tag v${F_VERSION} -f

echo "pushing"
git push github latest --tags -f
git push origin latest --tags -f

echo "done!"

0 comments on commit 89bc1d6

Please sign in to comment.