From b411bbcd4ad96437e66f359abc5b628477549c83 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Wed, 29 Jul 2026 14:27:24 +0100
Subject: [PATCH] Move `getJobUUID` call into `runInActions` for `init` and
 `setup-codeql`

---
 lib/entry-points.js        |  8 ++++----
 src/action-common.ts       | 10 ++++++++--
 src/init-action.ts         |  4 ----
 src/setup-codeql-action.ts |  4 ----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/entry-points.js b/lib/entry-points.js
index 9a7fbaa8e..c56f67109 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -146700,13 +146700,15 @@ async function runInActions(action) {
   const env = getEnv();
   const actionsEnv = getActionsEnv();
   try {
-    await action.run({
+    const actionState = {
       name: action.name,
       startedAt,
       logger,
       env,
       actions: actionsEnv
-    });
+    };
+    getJobUUID(actionState);
+    await action.run(actionState);
   } catch (error3) {
     core8.setFailed(
       `${getDisplayActionName(action.name)} action failed: ${getErrorMessage(error3)}`
@@ -160779,7 +160781,6 @@ async function run3(actionState) {
       logger
     );
     const repositoryProperties = repositoryPropertiesResult.orElse({});
-    getJobUUID(actionState);
     core21.exportVariable("CODEQL_ACTION_INIT_HAS_RUN" /* INIT_ACTION_HAS_RUN */, "true");
     sourceRoot = path24.resolve(
       getRequiredEnvParam("GITHUB_WORKSPACE"),
@@ -161777,7 +161778,6 @@ async function run6(actionState) {
     );
     const repositoryProperties = repositoryPropertiesResult.orElse({});
     const actionStateWithFeatures = { ...actionState, features };
-    getJobUUID(actionState);
     const statusReportBase = await createStatusReportBase(
       "setup-codeql" /* SetupCodeQL */,
       "starting",
diff --git a/src/action-common.ts b/src/action-common.ts
index cbb1cd342..be8629add 100644
--- a/src/action-common.ts
+++ b/src/action-common.ts
@@ -8,6 +8,7 @@ import { getActionsLogger, Logger } from "./logging";
 import {
   ActionName,
   getDisplayActionName,
+  getJobUUID,
   sendUnhandledErrorStatusReport,
 } from "./status-report";
 import { getEnv, getErrorMessage } from "./util";
@@ -88,13 +89,18 @@ export async function runInActions(action: Action) {
   const actionsEnv = getActionsEnv();
 
   try {
-    await action.run({
+    const actionState = {
       name: action.name,
       startedAt,
       logger,
       env,
       actions: actionsEnv,
-    });
+    };
+
+    // Create a unique identifier for this run.
+    getJobUUID(actionState);
+
+    await action.run(actionState);
   } catch (error) {
     core.setFailed(
       `${getDisplayActionName(action.name)} action failed: ${getErrorMessage(error)}`,
diff --git a/src/init-action.ts b/src/init-action.ts
index f1c391631..00143df42 100644
--- a/src/init-action.ts
+++ b/src/init-action.ts
@@ -68,7 +68,6 @@ import {
   createInitWithConfigStatusReport,
   createStatusReportBase,
   getActionsStatus,
-  getJobUUID,
   sendStatusReport,
 } from "./status-report";
 import { ToolsDownloadStatusReport } from "./tools-download";
@@ -255,9 +254,6 @@ async function run(
     );
     const repositoryProperties = repositoryPropertiesResult.orElse({});
 
-    // Create a unique identifier for this run.
-    getJobUUID(actionState);
-
     core.exportVariable(EnvVar.INIT_ACTION_HAS_RUN, "true");
 
     // path.resolve() respects the intended semantics of source-root. If
diff --git a/src/setup-codeql-action.ts b/src/setup-codeql-action.ts
index d2f8c6104..7873449f9 100644
--- a/src/setup-codeql-action.ts
+++ b/src/setup-codeql-action.ts
@@ -25,7 +25,6 @@ import {
   InitToolsDownloadFields,
   createStatusReportBase,
   getActionsStatus,
-  getJobUUID,
   sendStatusReport,
 } from "./status-report";
 import { ToolsDownloadStatusReport } from "./tools-download";
@@ -140,9 +139,6 @@ async function run(
 
     const actionStateWithFeatures = { ...actionState, features };
 
-    // Create a unique identifier for this run.
-    getJobUUID(actionState);
-
     const statusReportBase = await createStatusReportBase(
       ActionName.SetupCodeQL,
       "starting",