Skip to content

Commit aaff0f0

Browse files
authored
Merge pull request DSpace#2424 from tdonohue/test-fix-for-backport-action
Enable early release of backport-action to test korthout/backport-action#372
2 parents 4abbd37 + 419868b commit aaff0f0

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

.github/workflows/port_merged_pull_request.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
# Port PR to other branch (ONLY if labeled with "port to")
2828
# See https://github.com/korthout/backport-action
2929
- name: Create backport pull requests
30-
uses: korthout/backport-action@v1
30+
uses: korthout/backport-action@341-default-mainline
3131
with:
3232
# Trigger based on a "port to [branch]" label on PR
3333
# (This label must specify the branch name to port to)
@@ -39,6 +39,9 @@ jobs:
3939
# Copy all labels from original PR to (newly created) port PR
4040
# NOTE: The labels matching 'label_pattern' are automatically excluded
4141
copy_labels_pattern: '.*'
42+
# The --mainline (parent-number) to use when cherry-picking. Value of '1' allows
43+
# merge commits to be cherry picked. See https://git-scm.com/docs/git-cherry-pick
44+
default_mainline: 1
4245
# Use a personal access token (PAT) to create PR as 'dspace-bot' user.
4346
# A PAT is required in order for the new PR to trigger its own actions (for CI checks)
4447
github_token: ${{ secrets.PR_PORT_TOKEN }}

0 commit comments

Comments
 (0)