Add build number to application artifact

guardian · Jul 29, 2024 · 4a5a053 · 4a5a053
1 parent 0b315ed
commit 4a5a053
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,6 +49,6 @@ jobs:
             cdk.out:
               - cdk/cdk.out
             cdk-playground:
-              - target/cdk-playground.deb
+              - dist/cdk-playground
             cdk-playground-lambda:
               - lambda/cdk-playground-lambda.zip
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 target
 logs
 lambda/cdk-playground-lambda.zip
+dist/
diff --git a/cdk/jest.setup.js b/cdk/jest.setup.js
@@ -1 +1,3 @@
-jest.mock("@guardian/cdk/lib/constants/tracking-tag");
+jest.mock('@guardian/cdk/lib/constants/tracking-tag');
+
+process.env.GITHUB_RUN_NUMBER = 'TEST';
diff --git a/cdk/lib/__snapshots__/cdk-playground.test.ts.snap b/cdk/lib/__snapshots__/cdk-playground.test.ts.snap
@@ -1739,13 +1739,13 @@ exitCode=$?
         
 }
 trap exitTrap EXIT
-mkdir -p $(dirname '/cdk-playground/cdk-playground.deb')
+mkdir -p $(dirname '/cdk-playground/cdk-playground-TEST.deb')
 aws s3 cp 's3://",
                   Object {
                     "Ref": "DistributionBucketName",
                   },
-                  "/playground/PROD/cdk-playground/cdk-playground.deb' '/cdk-playground/cdk-playground.deb'
-dpkg -i /cdk-playground/cdk-playground.deb
+                  "/playground/PROD/cdk-playground/cdk-playground-TEST.deb' '/cdk-playground/cdk-playground-TEST.deb'
+dpkg -i /cdk-playground/cdk-playground-TEST.deb
 # GuEc2AppExperimental UserData Start
 
       INSTANCE_ID=$(ec2metadata --instance-id)

diff --git a/cdk/lib/cdk-playground.ts b/cdk/lib/cdk-playground.ts
@@ -27,15 +27,17 @@ export class CdkPlayground extends GuStack {
 		const ec2App = 'cdk-playground';
 		const ec2AppDomainName = 'cdk-playground.gutools.co.uk';
 
+		const buildNumber = process.env.GITHUB_RUN_NUMBER ?? 'DEV';
+
 		const { loadBalancer } = new GuEc2AppExperimental(this, {
 			applicationPort: 9000,
 			app: ec2App,
 			instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.MICRO),
 			access: { scope: AccessScope.PUBLIC },
 			userData: {
 				distributable: {
-					fileName: `${ec2App}.deb`,
-					executionStatement: `dpkg -i /${ec2App}/${ec2App}.deb`,
+					fileName: `${ec2App}-${buildNumber}.deb`,
+					executionStatement: `dpkg -i /${ec2App}/${ec2App}-${buildNumber}.deb`,
 				},
 			},
 			certificateProps: {

diff --git a/script/ci b/script/ci
@@ -17,5 +17,5 @@ set -e
 
 sbt clean compile test debian:packageBin
 
-# `sbt debian:packageBin` produces `target/cdk-playground_1.0-SNAPSHOT_all.deb`. Rename it to something easier.
-mv target/cdk-playground_1.0-SNAPSHOT_all.deb target/cdk-playground.deb
+mkdir -p dist/cdk-playground
+mv target/cdk-playground_1.0-SNAPSHOT_all.deb "dist/cdk-playground/cdk-playground-$GITHUB_RUN_NUMBER.deb"