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

Commit 354b797

Browse files
author
Kent C. Dodds
committed
fix(build): Checkout latest before merging/committing
When conventional-changelog runs v6.24.21, if we're not on the branch that has the tags, then we're not going to get the right tags, so we need to first checkout the latest branch which is the one with the tags ref #455
1 parent 0ddad1a commit 354b797

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

scripts/publish-latest.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ git config --global user.name formly-bot
1010
echo "setting remote"
1111
git remote set-url origin https://formly-bot:$BOT_GH_TOKEN@github.com/formly-js/angular-formly.git >/dev/null 2>/dev/null
1212

13+
echo "checking out latest"
14+
git fetch
15+
git checkout latest
16+
1317
echo "merging master"
1418
git merge origin/master -m "master merge" -X theirs
1519

0 commit comments

Comments
 (0)