Skip to content

Commit

Permalink
chore: add original description to backported/cherry-picked PRs
Browse files Browse the repository at this point in the history
Signed-off-by: Joshua Schmid <[email protected]>
  • Loading branch information
jschmid1 committed Jan 25, 2024
1 parent 01eb29e commit 34b0519
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/cherry-picks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,18 @@ 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}'
merge_commits: 'skip'
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: |-
{
Expand Down

0 comments on commit 34b0519

Please sign in to comment.