ci: Use git-cherry-pick to merge the upstream recipe commits

akirak · Nov 3, 2023 · 202e481 · 202e481
1 parent 3c65d0b
commit 202e481
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -64,14 +64,10 @@ jobs:
             commit.committer_date = commit.author_date
           ' --force
 
-    - name: Rebase
-      run: |
-        git rebase -s ort -X ours ${{ steps.start.outputs.rev }}
-
-    - name: Merge into the original branch
+    - name: Cherry-pick the filtered commits
       run: |
         git switch ${{ matrix.base_ref }}
-        git merge --ff upstream-recipes
+        git cherry-pick --strategy ort -X hours ..upstream-recipes
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5