From 01942c8c612b41677685e13d9a64be16713afc62 Mon Sep 17 00:00:00 2001 From: Aaron Dalton Date: Thu, 18 Jan 2024 21:38:57 -0800 Subject: [PATCH] always create release from upstream tag --- .github/workflows/fork-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index ce925302..aa1776bf 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -44,7 +44,7 @@ jobs: run: | for TAG in ${NEW_TAGS}; do - git checkout -b release/${TAG} ${TAG} + git checkout -b release/${TAG} upstream/${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 tag -d ${TAG}