Merge pull request #322 from guardian/aa/revision

fix: Correctly obtain revision

Author: akash1810

dist/index.js

@@ -65943,6 +65943,14 @@ var getRoleArn = () => {
   }
   return roleArn;
 };
+var getRevision = () => {
+  if (context2.eventName === "pull_request") {
+    const payload2 = context2.payload;
+    return payload2.pull_request.head.sha;
+  } else {
+    return context2.sha;
+  }
+};
 function getConfiguration() {
   const riffRaffYaml = getRiffRaffYaml();
   const projectName = getProjectName(riffRaffYaml);
@@ -65963,7 +65971,7 @@ function getConfiguration() {
     buildNumber,
     branchName: branchName() ?? "dev",
     vcsURL: vcsURL() ?? "dev",
-    revision: envOrUndefined("GITHUB_SHA") ?? "dev",
+    revision: getRevision(),
     deployments: getDeployments(),
     stagingDirInput,
     githubToken: githubToken(),

package-lock.json

@@ -31,6 +31,7 @@
     "@guardian/eslint-config": "14.0.1",
     "@guardian/prettier": "^10.0.0",
     "@guardian/tsconfig": "^1.0.1",
+    "@octokit/webhooks-definitions": "^3.68.1",
     "@types/jest": "30.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "25.6.0",

package.json

@@ -1,4 +1,6 @@
 import * as core from '@actions/core';
+import { context } from '@actions/github';
+import type { PullRequestEvent } from '@octokit/webhooks-definitions/schema';
 import * as yaml from 'js-yaml';
 import { read } from './file';
 import type { Deployment, RiffraffYaml } from './riffraff';
@@ -190,6 +192,16 @@ const getRoleArn = (): string => {
 	return roleArn;
 };
 
+const getRevision = (): string => {
+	if (context.eventName === 'pull_request') {
+		// See https://github.com/orgs/community/discussions/26325
+		const payload = context.payload as PullRequestEvent;
+		return payload.pull_request.head.sha;
+	} else {
+		return context.sha;
+	}
+};
+
 export function getConfiguration(): Configuration {
 	const riffRaffYaml = getRiffRaffYaml();
 	const projectName = getProjectName(riffRaffYaml);
@@ -215,7 +227,7 @@ export function getConfiguration(): Configuration {
 		buildNumber,
 		branchName: branchName() ?? 'dev',
 		vcsURL: vcsURL() ?? 'dev',
-		revision: envOrUndefined('GITHUB_SHA') ?? 'dev',
+		revision: getRevision(),
 		deployments: getDeployments(),
 		stagingDirInput,
 		githubToken: githubToken(),