From 5972b50fe0fab609ed3d27701332bba98729f0cc Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Thu, 6 Jul 2023 13:30:46 -0400 Subject: [PATCH] change sync direction to latest -> develop --- .github/workflows/sync.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 89db76d6..0a4a7170 100644 --- 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 github-actions@github.com 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