From bcd111bd12b9d6db58a88fac728fc51af4d96c12 Mon Sep 17 00:00:00 2001 From: Jongwook Choi Date: Mon, 1 Jan 2024 08:35:35 -0500 Subject: [PATCH] ci: write the correct cherry-picked commit id when backporting Problem: Commits backport-merged to release branches are cherry-picked from the original commits in the PR from a fork repository, NOT the actual commit that are merged to neovim/neovim (HEAD). Therefore the commit reference in the commit message `cherry picked from commit ...` usually refers to a commit that does NOT exist in the repository, given that our preferred way of merging PR (rebasing, squashing, etc.) would rewrite commits. Solution: Turn on new feature 'detect_merge_method' of backport-action workflow. --- .github/workflows/backport.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 3ed5573262..88cddcded4 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,3 +14,9 @@ jobs: - uses: actions/checkout@v4 - name: Create backport PRs uses: korthout/backport-action@v2 + with: + # https://github.com/korthout/backport-action/pull/399 + experimental: > + { + "detect_merge_method": true + }