Add run number in artifact name

gradle · Sep 17, 2024 · f621826 · f621826
1 parent 60deab9
commit f621826
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/build-scan-shared/src/setup/post.ts b/build-scan-shared/src/setup/post.ts
@@ -4,6 +4,7 @@ import {DefaultArtifactClient} from '@actions/artifact'
 
 import * as input from './input'
 import * as commonBuildTool from '../buildTool/common'
+import * as githubUtils from '../utils/github'
 import * as summary from '../summary/dump'
 
 export async function post(buildTool: commonBuildTool.BuildTool): Promise<void> {
@@ -48,5 +49,5 @@ async function uploadArtifacts(
 function getArtifactName(buildScanArtifactName: string): string {
     return `${buildScanArtifactName}-${input.getWorkflowName().replaceAll(' ', '-')}-${input
         .getJobName()
-        .replaceAll(' ', '-')}`
+        .replaceAll(' ', '-')}-${githubUtils.getRunNumber()}`
 }
diff --git a/build-scan-shared/src/utils/github.ts b/build-scan-shared/src/utils/github.ts
@@ -43,6 +43,10 @@ function getRunActorForTest(): string {
     return github.context.actor
 }
 
+export function getRunNumber(): number {
+    return github.context.runNumber
+}
+
 function getListArtifactsOptions(): any {
     return isUnderTest() ? getListArtifactsOptionsForTest() : getListArtifactsOptionsForWorkflowRun()
 }

diff --git a/dist/maven-publish-build-scan/index.js b/dist/maven-publish-build-scan/index.js
@@ -135459,6 +135459,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getOctokit = getOctokit;
 exports.isPublicationAllowed = isPublicationAllowed;
+exports.getRunNumber = getRunNumber;
 exports.getArtifactIdsForWorkflowRun = getArtifactIdsForWorkflowRun;
 exports.downloadBuildScanData = downloadBuildScanData;
 exports.downloadArtifact = downloadArtifact;
@@ -135497,6 +135498,9 @@ function getRunActorForWorkflowRun() {
 function getRunActorForTest() {
     return github.context.actor;
 }
+function getRunNumber() {
+    return github.context.runNumber;
+}
 function getListArtifactsOptions() {
     return isUnderTest() ? getListArtifactsOptionsForTest() : getListArtifactsOptionsForWorkflowRun();
 }

diff --git a/dist/maven-setup/post/index.js b/dist/maven-setup/post/index.js
@@ -135280,6 +135280,7 @@ const core = __importStar(__nccwpck_require__(42186));
 const glob = __importStar(__nccwpck_require__(28090));
 const artifact_1 = __nccwpck_require__(79450);
 const input = __importStar(__nccwpck_require__(24758));
+const githubUtils = __importStar(__nccwpck_require__(54377));
 const summary = __importStar(__nccwpck_require__(14277));
 async function post(buildTool) {
     await uploadBuildScanDataFiles(buildTool);
@@ -135313,7 +135314,7 @@ async function uploadArtifacts(files, buildScanDataFolder, buildScanArtifactName
 function getArtifactName(buildScanArtifactName) {
     return `${buildScanArtifactName}-${input.getWorkflowName().replaceAll(' ', '-')}-${input
         .getJobName()
-        .replaceAll(' ', '-')}`;
+        .replaceAll(' ', '-')}-${githubUtils.getRunNumber()}`;
 }
 
 
@@ -135478,6 +135479,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getOctokit = getOctokit;
 exports.isPublicationAllowed = isPublicationAllowed;
+exports.getRunNumber = getRunNumber;
 exports.getArtifactIdsForWorkflowRun = getArtifactIdsForWorkflowRun;
 exports.downloadBuildScanData = downloadBuildScanData;
 exports.downloadArtifact = downloadArtifact;
@@ -135516,6 +135518,9 @@ function getRunActorForWorkflowRun() {
 function getRunActorForTest() {
     return github.context.actor;
 }
+function getRunNumber() {
+    return github.context.runNumber;
+}
 function getListArtifactsOptions() {
     return isUnderTest() ? getListArtifactsOptionsForTest() : getListArtifactsOptionsForWorkflowRun();
 }

diff --git a/release/changelog.md b/release/changelog.md
@@ -1,2 +1,3 @@
 - Fixes a bug where setting the develocity-token-expiry parameter had no effect
-- Update Develocity Maven extension to 1.22.1
+- Add run attempt number to the artifact name containing the build scan data and metadata
+- Update Develocity Maven extension to 1.22.1