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

Commit 3e70d9a

Browse files
author
Kent C. Dodds
committed
fix(build): I am so close #455
1 parent 8656e9a commit 3e70d9a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

scripts/publish-latest.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ 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 temp branch"
11+
git checkout -b travis/temp
12+
1013
echo "adding dist"
1114
git add dist package.json
1215

@@ -21,8 +24,8 @@ git remote set-branches --add origin latest # required because travis clones wit
2124
git fetch origin
2225
git checkout latest
2326

24-
echo "merging master"
25-
git merge master -m "master merge" -X theirs
27+
echo "merging built files"
28+
git merge travis/temp -m "merging built files" -X theirs
2629

2730
echo "pushing"
2831
git push origin HEAD:latest -f >/dev/null 2>/dev/null

0 commit comments

Comments
 (0)