From 519f540ff1823f0bb39686b6e0eeed8b27724561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniels=20=C5=A0atcs?= <dev@dshatz.com>
Date: Thu, 9 Apr 2026 23:20:29 +0300
Subject: [PATCH] Use issue argument to get the correct SHA for the status
 check

---
 src/github/handler.ts | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/github/handler.ts b/src/github/handler.ts
index 63066fc4..6c19edbe 100644
--- a/src/github/handler.ts
+++ b/src/github/handler.ts
@@ -4,7 +4,8 @@ import {
   updateComment,
   listComments,
   addCommentToIssue,
-  deleteComment
+  deleteComment,
+  createGitHubClient
 } from '../client/github'
 import { Inputs } from '../types'
 import { Report } from '../ctrf/core/types/ctrf'
@@ -285,10 +286,28 @@ export async function createStatusCheck(
   }
 
   try {
+    // Use the correct SHA for PR association
+    let sha = context.sha
+    if (inputs.issue) {
+      try {
+        const octokit = await createGitHubClient()
+        const pr = await octokit.pulls.get({
+          owner: context.repo.owner,
+          repo: context.repo.repo,
+          pull_number: parseInt(inputs.issue)
+        })
+        sha = pr.data.head.sha
+        core.info(`Using PR head SHA: ${sha} for PR #${inputs.issue}`)
+      } catch (error) {
+        core.warning(`Failed to fetch PR #${inputs.issue}, using context.sha: ${context.sha}. ${String(error)}`)
+        sha = context.sha
+      }
+    }
+    
     await createCheckRun(
       context.repo.owner,
       context.repo.repo,
-      context.sha,
+      sha,
       inputs.statusCheckName,
       'completed',
       report.results.summary.failed > 0 ? 'failure' : 'success',