Bug fixes and improvements.

Author: desrosj

.github/workflows/create-backport-prs.yml

@@ -200,7 +200,7 @@ jobs:
           MATRIX_BRANCH: ${{ matrix.branch }}
           HEAD_BRANCH_SUFFIX: ${{ needs.resolve-context.outputs.branch-suffix }}
         run: |
-          BRANCH_NAME="backport/${MATRIX_BRANCH}-${HEAD_BRANCH_SUFFIX}"
+          BRANCH_NAME="backport-${MATRIX_BRANCH}/${HEAD_BRANCH_SUFFIX}"
 
           if git ls-remote --exit-code --heads origin "${BRANCH_NAME}" > /dev/null 2>&1; then
             echo "::error::Branch '${BRANCH_NAME}' already exists on origin."
@@ -286,7 +286,6 @@ jobs:
               git cherry-pick --abort 2>/dev/null || git reset --hard HEAD
               RESULTS="${RESULTS}${PR_NUMBER}=❌ "
               FAILED=true
-              break
             fi
           done
 
@@ -300,7 +299,7 @@ jobs:
         env:
           MATRIX_BRANCH: ${{ matrix.branch }}
           HEAD_BRANCH_SUFFIX: ${{ needs.resolve-context.outputs.branch-suffix }}
-        run: git push -u origin "backport/${MATRIX_BRANCH}-${HEAD_BRANCH_SUFFIX}"
+        run: git push -u origin "backport-${MATRIX_BRANCH}/${HEAD_BRANCH_SUFFIX}"
 
       - name: Save results
         if: always()
@@ -317,7 +316,7 @@ jobs:
 
       - name: Upload results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: apply-results-${{ matrix.branch }}
           path: apply-results/
@@ -346,7 +345,7 @@ jobs:
     steps:
       - name: Download apply result
         id: apply-result
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: apply-results-${{ matrix.branch }}
           path: apply-result/
@@ -366,7 +365,7 @@ jobs:
           REPO_SOURCE: ${{ inputs.repo-source }}
           PR_TARGET: ${{ inputs.pr-target }}
         run: |
-          BACKPORT_BRANCH="backport/${MATRIX_BRANCH}-${HEAD_BRANCH_SUFFIX}"
+          BACKPORT_BRANCH="backport-${MATRIX_BRANCH}/${HEAD_BRANCH_SUFFIX}"
 
           if [ "${REPO_SOURCE}" = "upstream" ]; then
             SOURCE_REPO="${UPSTREAM_REPO}"
@@ -402,6 +401,8 @@ jobs:
             done
           fi
 
+          BODY="${BODY}\n\n---\n\nThis PR was generated from a [GitHub Actions workflow run](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}) triggered by @${GITHUB_ACTOR}."
+
           if [ "${PR_TARGET}" = "upstream" ]; then
             PR_REPO="${UPSTREAM_REPO}"
             PR_HEAD="${GITHUB_REPOSITORY_OWNER}:${BACKPORT_BRANCH}"
@@ -434,6 +435,7 @@ jobs:
           PR_URL: ${{ steps.create-pr.outputs.url }}
           COMMIT_SHA: ${{ inputs.commit-sha }}
           PR_NUMBERS: ${{ inputs.pr_numbers }}
+          PR_NAME: ${{ inputs.pr-name }}
         run: |
           mkdir -p summary-row
           SAFE_BRANCH=$(echo "${MATRIX_BRANCH}" | tr '.' '-')
@@ -443,7 +445,22 @@ jobs:
             MERGE_RESULTS=$(grep '^merge_results=' "apply-result/${SAFE_BRANCH}.txt" | cut -d= -f2-)
           fi
 
-          PR_DISPLAY="${PR_URL:-N/A}"
+          RUN_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+
+          if [ -n "${PR_URL}" ]; then
+            if [ -n "${PR_NUMBERS}" ] && [ -z "${COMMIT_SHA}" ]; then
+              PR_DISPLAY="${PR_URL}"
+            else
+              if [ -n "${PR_NAME}" ]; then
+                PR_TITLE="${PR_NAME} - ${MATRIX_BRANCH} branch"
+              else
+                PR_TITLE="Backport to ${MATRIX_BRANCH}"
+              fi
+              PR_DISPLAY="[${PR_TITLE}](${PR_URL})"
+            fi
+          else
+            PR_DISPLAY="[View log](${RUN_URL})"
+          fi
 
           if [ -n "${PR_NUMBERS}" ] && [ -z "${COMMIT_SHA}" ]; then
             IFS=',' read -ra PR_LIST <<< "${PR_NUMBERS}"
@@ -462,7 +479,7 @@ jobs:
 
       - name: Upload summary row
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: summary-row-${{ matrix.branch }}
           path: summary-row/
@@ -475,12 +492,12 @@ jobs:
   # - Writes the table header and appends all rows to the workflow summary.
   report:
     name: Backport report
-    needs: [ 'backport', 'create-pr' ]
+    needs: [ 'validate-inputs', 'backport', 'create-pr' ]
     runs-on: ubuntu-24.04
-    if: always()
+    if: ${{ always() && needs.validate-inputs.result != 'failure' }}
     steps:
       - name: Download summary rows
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: summary-row-*
           path: summary-rows/