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

Commit 15be679

Browse files
author
Kent C. Dodds
committed
fix(build): Add set-branches --add origin latest. #455
1 parent 48dd891 commit 15be679

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

scripts/publish-latest.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ echo "setting global bot config"
77
git config --global user.email [email protected]
88
git config --global user.name formly-bot
99

10-
echo "checking out latest"
11-
git remote show origin
12-
git remote update
13-
git fetch origin
14-
git checkout --track origin/latest
15-
1610
echo "setting remote"
1711
git remote set-url origin https://formly-bot:$BOT_GH_TOKEN@github.com/formly-js/angular-formly.git >/dev/null 2>/dev/null
1812

13+
echo "checking out latest"
14+
git remote set-branches --add origin latest # required because travis clones with --branch=master
15+
git fetch origin
16+
git checkout latest
17+
1918
echo "merging master"
2019
git merge origin/master -m "master merge" -X theirs
2120

0 commit comments

Comments
 (0)