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 }}