Use run ID instead of job ID as artifact key.

nichtverstehen · nichtverstehen · commit bdeb0013794f · 2024-03-27T15:39:07.000+01:00
diff --git a/actions-toolkit b/actions-toolkit
@@ -1 +1 @@
-Subproject commit b6d2f51da3ee3aee51e8779a5dc31b661c92121d
+Subproject commit 072645720370a60e6aaa20b08cd8c66daf811b2d
diff --git a/dist/merge/index.js b/dist/merge/index.js
@@ -3357,9 +3357,9 @@ function getBackendIdsFromToken() {
             // missing expected number of claims
             throw InvalidJwtError;
         }
-        const publicRunId = process.env["GITHUB_JOB"];
+        const publicRunId = process.env["GITHUB_RUN_ID"];
         if (publicRunId == null) {
-            throw new Error("failed to get GITHUB_JOB environment variable");
+            throw new Error("failed to get GITHUB_RUN_ID environment variable");
         }
         const ids = {
             workflowRunBackendId: scopeParts[1],
@@ -3368,6 +3368,7 @@ function getBackendIdsFromToken() {
         };
         core.debug(`Workflow Run Backend ID: ${ids.workflowRunBackendId}`);
         core.debug(`Workflow Job Run Backend ID: ${ids.workflowJobRunBackendId}`);
+        core.debug(`Public Run ID: ${ids.publicRunId}`);
         return ids;
     }
     throw InvalidJwtError;
diff --git a/dist/upload/index.js b/dist/upload/index.js
@@ -3357,9 +3357,9 @@ function getBackendIdsFromToken() {
             // missing expected number of claims
             throw InvalidJwtError;
         }
-        const publicRunId = process.env["GITHUB_JOB"];
+        const publicRunId = process.env["GITHUB_RUN_ID"];
         if (publicRunId == null) {
-            throw new Error("failed to get GITHUB_JOB environment variable");
+            throw new Error("failed to get GITHUB_RUN_ID environment variable");
         }
         const ids = {
             workflowRunBackendId: scopeParts[1],
@@ -3368,6 +3368,7 @@ function getBackendIdsFromToken() {
         };
         core.debug(`Workflow Run Backend ID: ${ids.workflowRunBackendId}`);
         core.debug(`Workflow Job Run Backend ID: ${ids.workflowJobRunBackendId}`);
+        core.debug(`Public Run ID: ${ids.publicRunId}`);
         return ids;
     }
     throw InvalidJwtError;

Original file line number	Diff line number	Diff line change
`@@ -3357,9 +3357,9 @@ function getBackendIdsFromToken() {`
`3357`	`3357`	`// missing expected number of claims`
`3358`	`3358`	`throw InvalidJwtError;`
`3359`	`3359`	`}`
`3360`		`- const publicRunId = process.env["GITHUB_JOB"];`
	`3360`	`+ const publicRunId = process.env["GITHUB_RUN_ID"];`
`3361`	`3361`	`if (publicRunId == null) {`
`3362`		`- throw new Error("failed to get GITHUB_JOB environment variable");`
	`3362`	`+ throw new Error("failed to get GITHUB_RUN_ID environment variable");`
`3363`	`3363`	`}`
`3364`	`3364`	`const ids = {`
`3365`	`3365`	`workflowRunBackendId: scopeParts[1],`
`@@ -3368,6 +3368,7 @@ function getBackendIdsFromToken() {`
`3368`	`3368`	`};`
`3369`	`3369`	core.debug(`Workflow Run Backend ID: ${ids.workflowRunBackendId}`);
`3370`	`3370`	core.debug(`Workflow Job Run Backend ID: ${ids.workflowJobRunBackendId}`);
	`3371`	+ core.debug(`Public Run ID: ${ids.publicRunId}`);
`3371`	`3372`	`return ids;`
`3372`	`3373`	`}`
`3373`	`3374`	`throw InvalidJwtError;`