Skip to content

Commit

Permalink
fix build script
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo82148 committed Jun 19, 2023
1 parent e98e6ea commit 6323ce6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .github/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ git commit -m "bump $MAJOR" || true
git push origin "$CURRENT_BRANCH"

# checkout releases branch
git branch -D "releases/$MAJOR" || true
git checkout -b "releases/$MAJOR" "origin/releases/$MAJOR" || git checkout -b "releases/$MAJOR" "$CURRENT_BRANCH"
git merge -X theirs --no-ff -m "Merge branch '$CURRENT_BRANCH' into releases/$MAJOR" "$CURRENT_BRANCH" || true

Expand Down

0 comments on commit 6323ce6

Please sign in to comment.