From db1d8e61d129b0f0ef8395207823f4b989319403 Mon Sep 17 00:00:00 2001 From: Aaron Dalton Date: Fri, 19 Jan 2024 07:33:07 -0800 Subject: [PATCH] Update fork workflows --- .github/workflows/fork-sync.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 4f7659b0..045ae220 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -40,20 +40,13 @@ jobs: run: | for TAG in ${NEW_TAGS}; do git checkout -b release/${TAG} ${TAG} - 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 rev-list --no-merges --reverse main ^upstream | git cherry-pick --stdin git tag -d ${TAG} git tag ${TAG} release/${TAG} done for TAG in ${NEW_TAGS}; do git push -u origin release/${TAG}; done env: 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 -u origin upstream current env: GH_TOKEN: ${{ github.token }}