Skip to content

Commit b33fdef

Browse files
authored
Merge pull request #113 from brickhouse-tech/fix/ci-release-rebase
fix(ci): rebase before push in release workflow
2 parents 377af97 + b345c07 commit b33fdef

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,7 @@ jobs:
5757
npx commit-and-tag-version
5858
fi
5959
60+
# Pull any commits that landed during the test phase (e.g. dependabot merges)
61+
git pull --rebase origin master
6062
git push
6163
git push --tags

0 commit comments

Comments
 (0)