Update Jira workflow to trigger on push events

Author: mikedane-bitovi

.github/workflows/jira-callback.yml

@@ -1,43 +1,64 @@
-name: Jira → In Review when Copilot’s 2nd commit lands
+name: Jira → In Review when Copilot pushes a real commit
 
 on:
-  pull_request:
-    types: [synchronize]
+  push:
 
 permissions:
-  contents: write
+  contents: read
+  # give write if you want to add labels/comments later
   pull-requests: write
 
 jobs:
   mark_in_review:
-    # Adjust the author/label checks to your setup if needed
-    if: github.event.pull_request.commits >= 2
     runs-on: ubuntu-latest
     steps:
-      - name: Get Jira key from PR title
-        id: key
-        shell: bash
+      - name: Find Copilot commit with content + Jira key
+        id: find
         run: |
           set -euo pipefail
-          title="${{ github.event.pull_request.title }}"
-
-          # Match ABC-123 style key in title only
-          if [[ "$title" =~ ([A-Z][A-Z0-9]+-[0-9]+) ]]; then
-            echo "key=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
-          else
-            echo "No Jira issue key found in PR title" >&2
-            exit 1
+
+          found_key=""
+          for row in $(jq -c '.commits[]' <<< '${{ toJson(github.event.commits) }}'); do
+            committer=$(jq -r '.committer.name' <<< "$row")
+            message=$(jq -r '.message' <<< "$row")
+            added=$(jq -r '.added | length' <<< "$row")
+            modified=$(jq -r '.modified | length' <<< "$row")
+            removed=$(jq -r '.removed | length' <<< "$row")
+
+            # condition 1: committer must be Copilot (adjust string after testing in your repo)
+            if [[ "$committer" != "github-copilot[bot]" ]]; then
+              continue
+            fi
+
+            # condition 2: commit must have content
+            total_changes=$((added + modified + removed))
+            if [[ "$total_changes" -eq 0 ]]; then
+              continue
+            fi
+
+            # condition 3: commit message must contain a Jira key like ABC-123
+            if [[ "$message" =~ ([A-Z][A-Z0-9]+-[0-9]+) ]]; then
+              found_key="${BASH_REMATCH[1]}"
+              break
+            fi
+          done
+
+          if [[ -z "$found_key" ]]; then
+            echo "No matching Copilot contentful commit with Jira key found."
+            exit 0
           fi
 
+          echo "jira_key=$found_key" >> "$GITHUB_OUTPUT"
+
       - name: Call Jira Automation webhook
+        if: steps.find.outputs.jira_key != ''
         env:
           WEBHOOK_URL: ${{ secrets.JIRA_WEBHOOK_URL }}
           WEBHOOK_TOKEN: ${{ secrets.JIRA_WEBHOOK_TOKEN }}
-          ISSUE_KEY: ${{ steps.key.outputs.key }}
+          ISSUE_KEY: ${{ steps.find.outputs.jira_key }}
         run: |
           set -euo pipefail
-
-          # Single work item in the URL as ?issue=KEY (per Jira spec)
+          echo "Marking $ISSUE_KEY In Review…"
           curl -sS -X POST \
             -H "Content-Type: application/json" \
             -H "X-Automation-Webhook-Token: ${WEBHOOK_TOKEN}" \