Re-export codeql testing environment variable to subsequent steps, if…

… set.
github · Nov 1, 2022 · bfcbb09 · bfcbb09
1 parent 4b73c4f
commit bfcbb09
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/shared-environment.js b/lib/shared-environment.js
diff --git a/lib/shared-environment.js.map b/lib/shared-environment.js.map
diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -682,7 +682,15 @@ export async function createStatusReportBase(
   const codeQlCliVersion = getCachedCodeQlVersion();
   const actionRef = process.env["GITHUB_ACTION_REF"];
   const testingEnvironment =
-    process.env["CODEQL_ACTION_TESTING_ENVIRONMENT"] || "";
+    process.env[sharedEnv.CODEQL_ACTION_TESTING_ENVIRONMENT] || "";
+  // re-export the testing environment variable so that it is available to subsequent steps,
+  // even if it was only set for this step
+  if (testingEnvironment !== "") {
+    core.exportVariable(
+      sharedEnv.CODEQL_ACTION_TESTING_ENVIRONMENT,
+      testingEnvironment
+    );
+  }
 
   const statusReport: StatusReportBase = {
     workflow_run_id: workflowRunID,

diff --git a/src/shared-environment.ts b/src/shared-environment.ts
@@ -5,3 +5,6 @@ export const ODASA_TRACER_CONFIGURATION = "ODASA_TRACER_CONFIGURATION";
 // then this variable will be assigned the start time of the action invoked
 // rather that the init action.
 export const CODEQL_WORKFLOW_STARTED_AT = "CODEQL_WORKFLOW_STARTED_AT";
+
+export const CODEQL_ACTION_TESTING_ENVIRONMENT =
+  "CODEQL_ACTION_TESTING_ENVIRONMENT";