mirror of
https://github.com/neovim/neovim.git
synced 2024-12-28 14:31:13 -07:00
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.
This commit is contained in:
parent
7d17ab5b6f
commit
bcd111bd12
6
.github/workflows/backport.yml
vendored
6
.github/workflows/backport.yml
vendored
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user