Update dependabot-merger.yml

Author: nsingh-branch

.github/workflows/dependabot-merger.yml

@@ -42,41 +42,46 @@ jobs:
           fi
           echo "::set-output name=numbers::$PR_LIST"
           PR_COUNT=$(echo "$PR_LIST" | wc -l)
-          echo "$PR_COUNT PR's to be merged: $PR_LIST"
+          echo "$PR_COUNT PR's to be merged."
 
       - name: Merge PRs into new branch
         run: |
           NEW_BRANCH="dependabot-test-${{ steps.datetime.outputs.date }}"
           git checkout $NEW_BRANCH
-          PR_LIST=$(gh pr list --json number,headRefName --jq '.[] | "\(.number) \(.headRefName)"' | grep dependabot)
-          PR_LIST=$(echo "$PR_LIST" | tr -d '\r') # Remove trailing newline
-          echo "::set-output name=numbers::$PR_LIST"
-          PR_LINKS=""
           while IFS= read -r line; do
             IFS=' ' read -r PR_NUMBER BRANCH_NAME <<< "$line"
-            PR_URL="https://github.com/${GITHUB_REPOSITORY}/pull/$PR_NUMBER"
-            PR_LINKS+="\n• <$PR_URL|#${PR_NUMBER}: ${BRANCH_NAME}>"
             echo "Merging PR #$PR_NUMBER from branch $BRANCH_NAME into $NEW_BRANCH..."
             git fetch origin $BRANCH_NAME
             git merge --no-commit --allow-unrelated-histories --strategy-option=theirs origin/$BRANCH_NAME
             echo "Pushing changes to $NEW_BRANCH..."
             git commit -m "Merged PR #$PR_NUMBER into $NEW_BRANCH"
             git push origin $NEW_BRANCH
-          done <<< "$PR_LIST"
-          echo "::set-output name=pr_links::$PR_LINKS"
+          done <<< "${{ steps.pr_list.outputs.numbers }}"
 
       - name: Merge process status
         run: |
           echo "Merging process completed successfully!"
           echo "New branch name: dependabot-test-${{ steps.datetime.outputs.date }}"
 
+      - name: Generate PR links
+        id: pr_links
+        run: |
+          PR_LINKS=""
+          while IFS= read -r line; do
+            IFS=' ' read -r PR_NUMBER BRANCH_NAME <<< "$line"
+            PR_URL="https://github.com/${GITHUB_REPOSITORY}/pull/$PR_NUMBER"
+            PR_LINKS+="\n• <$PR_URL|#${PR_NUMBER}: ${BRANCH_NAME}>"
+          done <<< "${{ steps.pr_list.outputs.numbers }}"
+
+          echo "::set-output name=pr_links::$PR_LINKS"
+
       - name: Post to a Slack channel
         uses: slackapi/[email protected]
         with:
           channel-id: 'C04E69NEDAT'
           payload: |
             {
-             "blocks": [
+              "blocks": [
                 {
                   "type": "header",
                   "text": {
@@ -92,14 +97,14 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "*Testing Branch: *<https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/tree/dependabot-test-${{ steps.datetime.outputs.date }}|dependabot-test-${{ steps.datetime.outputs.date }}>"
+                    "text": "*Testing Branch: *<https://github.com/${GITHUB_REPOSITORY}/tree/dependabot-test-${{ steps.datetime.outputs.date }}|dependabot-test-${{ steps.datetime.outputs.date }}>"
                   }
                 },
                 {
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "'${{ steps.merge_prs.outputs.pr_links }}'"
+                    "text": "'${{ steps.pr_links.outputs.pr_links }}'"
                   }
                 }
               ]