From 34b051904a91d119c5505e15f7d43dc075fade52 Mon Sep 17 00:00:00 2001
From: Joshua Schmid <jaiks@posteo.de>
Date: Wed, 24 Jan 2024 10:26:30 +0100
Subject: [PATCH] chore: add original description to backported/cherry-picked
 PRs

Signed-off-by: Joshua Schmid <jaiks@posteo.de>
---
 .github/workflows/backport.yml     | 6 +++++-
 .github/workflows/cherry-picks.yml | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index b415b108faa7..99c77225c84e 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Create backport pull requests
-        uses: korthout/backport-action@930286d359d53effaf69607223933cbbb02460eb #v2.2.0
+        uses: korthout/backport-action@6e72f987c115430f6abc2fa92a74cdbf3e14b956 # v2.4.1
         with:
           github_token: ${{ secrets.PAT }}
           pull_title: '[backport -> ${target_branch}] ${pull_title}'
@@ -23,6 +23,10 @@ jobs:
           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}.
+
+            ## Original description
+
+            #{pull_description}
           copy_assignees: true
           copy_milestone: true
           copy_requested_reviewers: true
diff --git a/.github/workflows/cherry-picks.yml b/.github/workflows/cherry-picks.yml
index d04f54eac2bc..1510d2cdb211 100644
--- a/.github/workflows/cherry-picks.yml
+++ b/.github/workflows/cherry-picks.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           token: ${{ secrets.CHERRY_PICK_TOKEN }}
       - name: Create backport pull requests
-        uses: jschmid1/cross-repo-cherrypick-action@1182bef0772280407550496e3cceaecb7c0102d0 #v1.1.0
+        uses: jschmid1/cross-repo-cherrypick-action@2d2a475d31b060ac21521b5eda0a78876bbae94e #v1.1.0
         with:
           token: ${{ secrets.CHERRY_PICK_TOKEN }}
           pull_title: '[cherry-pick -> ${target_branch}] ${pull_title}'
@@ -34,6 +34,10 @@ jobs:
           trigger_label: 'cherry-pick kong-ee' # trigger based on this label
           pull_description: |-
             Automated cherry-pick to `${target_branch}`, triggered by a label in https://github.com/${owner}/${repo}/pull/${pull_number} :robot:.
+
+            ## Original description
+
+            #{pull_description}
           upstream_repo: 'kong/kong-ee'
           branch_map: |-
             {