From c4d4f159e8ffb1ded722d0193b8e5721cc5f4a9e Mon Sep 17 00:00:00 2001 From: Aaron Dalton Date: Thu, 18 Jan 2024 20:30:38 -0800 Subject: [PATCH] rename master --- .github/workflows/fork-sync.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index a56c2915..980590c8 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -44,9 +44,10 @@ jobs: NEW_TAGS: ${{inputs.tags || steps.fetch-upstream-tags.outputs.NEW_TAGS}} - name: Push Current run: | + git checkout -b current upstream git rev-list --no-merges --reverse origin/feature/add_auth ^upstream | git cherry-pick --stdin git rev-list --no-merges --reverse origin/fork/automation ^upstream -- .github/**| git cherry-pick --stdin - git push upstream release/current + git push upstream current env: GH_TOKEN: ${{ github.token }}