From d25521a16ff2be6b122353372d79118eeb27a07d Mon Sep 17 00:00:00 2001 From: Akira Komamura Date: Sun, 5 Nov 2023 04:04:16 +0900 Subject: [PATCH] ci: Use rebase --- .github/workflows/merge-upstream.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml index aca142e17f6..607f0285f2e 100644 --- a/.github/workflows/merge-upstream.yml +++ b/.github/workflows/merge-upstream.yml @@ -31,15 +31,12 @@ jobs: git remote add upstream ${{ matrix.upstream }} git fetch upstream ${{ matrix.upstream_branch }} - - name: Make a temporary branch - run: | - git switch -C tmp upstream/${{ matrix.upstream_branch }} - - name: Cherry pick commits run: | git config --add user.name 'github-actions[bot]' git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com' - git cherry-pick --strategy ort -X theirs ..${{ matrix.base_ref }} + git rebase --reapply-cherry-picks --keep-base \ + upstream/${{ matrix.upstream_branch }} - name: Push changes uses: ad-m/github-push-action@master