Merge pull request #2424 from tdonohue/test-fix-for-backport-action

Enable early release of backport-action to test korthout/backport-action#372

.github/workflows/port_merged_pull_request.yml

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