From 006692e01f4eba48fda5d66204d471c51a3eaeb5 Mon Sep 17 00:00:00 2001
From: Chris Earle <pickypg@gmail.com>
Date: Thu, 2 Jul 2026 12:04:21 -0600
Subject: [PATCH] [Buildkite] Provide SHA for the commit so the PR can link CI
 runs

This upfront looks up the SHA instead of passing `HEAD` to Buildkite
because, otherwise, you cannot tell that Buildkite is running
without checking the Buildkite pipeline directly or waiting until
the job passes (or fails).
---
 .github/workflows/buildkite-pr-command.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildkite-pr-command.yml b/.github/workflows/buildkite-pr-command.yml
index c84ce7fb..8dde831b 100644
--- a/.github/workflows/buildkite-pr-command.yml
+++ b/.github/workflows/buildkite-pr-command.yml
@@ -30,12 +30,27 @@ jobs:
             *) echo "::error::@${ACTOR} lacks write access (permission: ${level})"; exit 1 ;;
           esac
 
+      - name: Resolve PR head commit
+        id: pr
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+          PR: ${{ github.event.issue.number }}
+        run: |
+          gh api "repos/${REPO}/pulls/${PR}" \
+            --jq '"sha=" + .head.sha, "repo=" + (.head.repo.ssh_url // "")' >>"$GITHUB_OUTPUT"
+
       - name: Trigger Buildkite build
         env:
           BUILDKITE_API_TOKEN: ${{ secrets.BUILDKITE_API_TOKEN }}
           PR: ${{ github.event.issue.number }}
+          SHA: ${{ steps.pr.outputs.sha }}
+          HEAD_REPO: ${{ steps.pr.outputs.repo }}
         run: |
+          # Passing the resolved SHA (and head repo) up front -- instead of the literal
+          # string "HEAD" -- lets Buildkite link the build to the PR immediately, rather
+          # than only once the build finishes and Buildkite resolves the commit itself.
           curl -fsS -X POST \
             -H "Authorization: Bearer ${BUILDKITE_API_TOKEN}" \
             "https://api.buildkite.com/v2/organizations/elastic/pipelines/support-diagnostics/builds" \
-            -d "{\"commit\":\"HEAD\",\"branch\":\"refs/pull/${PR}/head\",\"pull_request_id\":${PR},\"pull_request_base_branch\":\"main\"}"
+            -d "{\"commit\":\"${SHA}\",\"branch\":\"refs/pull/${PR}/head\",\"pull_request_id\":${PR},\"pull_request_base_branch\":\"main\",\"pull_request_repository\":\"${HEAD_REPO}\"}"