change sync direction to latest -> develop (#835)

OSC · Jul 6, 2023 · cfd426c · cfd426c
1 parent bf884ea
commit cfd426c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -1,8 +1,8 @@
-name: Sync latest
+name: Sync develop
 
 on:
   push:
-    branches: [develop]
+    branches: [latest]
 
 defaults:
   run:
@@ -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