chore: improve backporting process

* now contains all the commits of a PR, not only the last one * now copies labels on the backport PRs * now copies milestones on the backport PRS * now copies requested reviewers to the backport PRS The action instructions for manually merging were mostly wrong and rarely worked. The actions are now more descriptive and separated (using worktrees) Signed-off-by: Joshua Schmid <[email protected]> (cherry picked from commit 2a8191e)
Kong · Nov 10, 2023 · 8eedc4f · 8eedc4f
1 parent 74be40a
commit 8eedc4f
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -1,24 +1,27 @@
 name: Backport
 on:
   pull_request_target:
-    types:
-      - closed
-      - labeled
-
+    types: [closed]
+permissions:
+  contents: write # so it can comment
+  pull-requests: write # so it can create pull requests
 jobs:
   backport:
     name: Backport
     runs-on: ubuntu-latest
-    if: >
-      github.event.pull_request.merged
-      && (
-        github.event.action == 'closed'
-        || (
-          github.event.action == 'labeled'
-          && contains(github.event.label.name, 'backport')
-        )
-      )
+    if: github.event.pull_request.merged
     steps:
-      - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2.0.3
+      - uses: actions/checkout@v4
+      - name: Create backport pull requests
+        uses: korthout/backport-action@cb79e4e5f46c7d7d653dd3d5fa8a9b0a945dfe4b # v2.1.0
         with:
           github_token: ${{ secrets.PAT }}
+          pull_title: '[backport -> ${target_branch}] ${pull_title}'
+          merge_commits: 'skip'
+          copy_labels_pattern: ^(?!backport ).* # copies all labels except those starting with "backport "
+          label_pattern: ^backport (release\/[^ ]+)$ # filters for labels starting with "backport " and extracts the branch name
+          pull_description: |-
+            Automated backport to `${target_branch}`, triggered by a label in #${pull_number}.
+          copy_assignees: true
+          copy_milestone: true
+          copy_requested_reviewers: true