Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change sync direction to latest -> develop #835

Merged
merged 1 commit into from
Jul 6, 2023
Merged

change sync direction to latest -> develop #835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions .github/workflows/sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Sync latest
name: Sync develop

on:
push:
branches: [develop]
branches: [latest]

defaults:
run:
Expand All @@ -24,15 +24,14 @@ jobs:
git config user.name github-actions
git config user.email [email protected]
git fetch
git checkout develop
git pull
git checkout latest
git pull
git merge develop
git checkout develop
git pull
git merge latest
# note that this shouldn't run if 'merge branches' fails, which it will happen when
# there are merge conflicts.
- name: Sync latest
if: contains(github.event.pull_request.labels.*.name, 'sync-latest')
- name: Sync develop
run: |
git push