You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
849 B
25 lines
849 B
2 years ago
|
#!/usr/bin/env bash
|
||
|
|
|
||
|
|
set -euo pipefail
|
||
|
|
|
||
|
|
# Define merge branch name
|
||
|
|
MERGE_BRANCH=merge/$GITHUB_REF_NAME
|
||
|
|
|
||
|
|
# Create the branch and force to start from ref
|
||
|
|
git checkout -B "$MERGE_BRANCH" "$GITHUB_REF_NAME"
|
||
|
|
|
||
|
|
# Get deleted changesets in this branch that might conflict with master
|
||
|
|
readarray -t DELETED_CHANGESETS < <(git diff origin/master --name-only -- '.changeset/*.md')
|
||
|
|
|
||
|
|
# Merge master, which will take those files cherry-picked. Auto-resolve conflicts favoring master.
|
||
|
|
git merge origin/master -m "Merge master to $GITHUB_REF_NAME" -X theirs
|
||
|
|
|
||
|
|
# Remove the originally deleted changesets to correctly sync with master
|
||
|
|
rm -f "${DELETED_CHANGESETS[@]}"
|
||
|
|
|
||
|
|
git add .changeset/
|
||
|
|
|
||
|
|
# Allow empty here since there may be no changes if `rm -f` failed for all changesets
|
||
|
|
git commit --allow-empty -m "Sync changesets with master"
|
||
|
|
git push -f origin "$MERGE_BRANCH"
|