Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/sync-branch-master-main.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Sync master branch and main branch
name: Sync main branch and master branch
on:
push:
branches:
- master
- main
jobs:
release-candidate:
runs-on: ubuntu-latest
Expand All @@ -15,10 +15,10 @@ jobs:
run: |
git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
git pull
- name: Merge master branch into main branch
- name: Merge main branch into master branch
run: |
git checkout -b main origin/main
git merge master --no-commit
- name: Push update to main branch
git checkout -b master origin/master
git merge main --no-commit
- name: Push update to master branch
run: |
git push origin main > /dev/null 2>&1
git push origin master > /dev/null 2>&1
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build and Test
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
paths:
- "**/Dockerfile"
- "poetry.lock"
Expand Down
Loading