Skip to content

Commit 99e7ba3

Browse files
committed
ci: changing master branch sync to main
1 parent ed00d91 commit 99e7ba3

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/branch-sync.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Sync Master to Release Branch
1+
name: Sync Main to Release Branch
22

33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
9-
sync_master_to_release:
9+
sync_main_to_release:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out the repo
@@ -19,23 +19,23 @@ jobs:
1919
git config user.name "GitHub Actions Bot"
2020
git config user.email "[email protected]"
2121
22-
- name: Merge master into release
22+
- name: Merge main into release
2323
run: |
2424
BRANCH_NAME="${{ vars.BRANCH_SYNC_TARGET }}"
2525
if [ -z "$BRANCH_NAME" ]; then echo "BRANCH_SYNC_TARGET variable is not set" && exit 1; fi
26-
echo "Syncing master to $BRANCH_NAME"
27-
git checkout master
28-
git pull origin master
29-
MASTER_COMMIT=$(git rev-parse HEAD)
26+
echo "Syncing main to $BRANCH_NAME"
27+
git checkout main
28+
git pull origin main
29+
MAIN_COMMIT=$(git rev-parse HEAD)
3030
3131
git fetch origin $BRANCH_NAME
3232
git checkout $BRANCH_NAME
3333
git pull origin $BRANCH_NAME
3434
RELEASE_COMMIT=$(git rev-parse HEAD)
35-
echo "Rebasing $BRANCH_NAME ($RELEASE_COMMIT) onto master ($MASTER_COMMIT)"
36-
git rebase master
35+
echo "Rebasing $BRANCH_NAME ($RELEASE_COMMIT) onto main ($MAIN_COMMIT)"
36+
git rebase main
3737
git push origin $BRANCH_NAME
3838
39-
echo "Merged master ($MASTER_COMMIT) into $BRANCH_NAME ($RELEASE_COMMIT)"
39+
echo "Merged main ($MAIN_COMMIT) into $BRANCH_NAME ($RELEASE_COMMIT)"
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)