diff options
| author | Jongwook Choi <wookayin@gmail.com> | 2024-01-01 08:35:35 -0500 |
|---|---|---|
| committer | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2024-01-01 15:17:56 +0100 |
| commit | bcd111bd12b9d6db58a88fac728fc51af4d96c12 (patch) | |
| tree | ac3b9b832fe7fe60b23d07f311e20e7cfba06c92 | |
| parent | 7d17ab5b6f075f0c9cfe6b00ae6948c345b6a280 (diff) | |
| download | rneovim-bcd111bd12b9d6db58a88fac728fc51af4d96c12.tar.gz rneovim-bcd111bd12b9d6db58a88fac728fc51af4d96c12.tar.bz2 rneovim-bcd111bd12b9d6db58a88fac728fc51af4d96c12.zip | |
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.
| -rw-r--r-- | .github/workflows/backport.yml | 6 |
1 files changed, 6 insertions, 0 deletions
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 + } |