Skip to content

Commit 5042785

Browse files
Include short SHA in nightly release metadata
- Add the short commit SHA to nightly release names - Export nightly metadata helpers and add coverage - Pass `short_sha` through the release workflow
1 parent 5424cfb commit 5042785

4 files changed

Lines changed: 50 additions & 13 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
version: ${{ steps.release_meta.outputs.version }}
3636
tag: ${{ steps.release_meta.outputs.tag }}
3737
release_name: ${{ steps.release_meta.outputs.name }}
38+
short_sha: ${{ steps.release_meta.outputs.short_sha }}
3839
cli_dist_tag: ${{ steps.release_meta.outputs.cli_dist_tag }}
3940
is_prerelease: ${{ steps.release_meta.outputs.is_prerelease }}
4041
make_latest: ${{ steps.release_meta.outputs.make_latest }}

‎scripts/release-smoke.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ try {
135135
"tag=nightly-v9.9.9-nightly.20260413.321",
136136
"Expected nightly metadata to contain the derived nightly tag.",
137137
);
138+
assertContains(
139+
nightlyReleaseMetadata,
140+
"name=T3 Code Nightly 9.9.9-nightly.20260413.321 (abcdef123456)",
141+
"Expected nightly metadata to include the short commit SHA in the release name.",
142+
);
138143

139144
const { arm64Path, x64Path } = writeMacManifestFixtures(tempRoot);
140145
execFileSync(
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { assert, it } from "@effect/vitest";
2+
3+
import {
4+
resolveNightlyBaseVersion,
5+
resolveNightlyReleaseMetadata,
6+
} from "./resolve-nightly-release.ts";
7+
8+
it("strips prerelease and build metadata when deriving the nightly base version", () => {
9+
assert.equal(resolveNightlyBaseVersion("0.0.17"), "0.0.17");
10+
assert.equal(resolveNightlyBaseVersion("9.9.9-smoke.0"), "9.9.9");
11+
assert.equal(resolveNightlyBaseVersion("1.2.3-beta.4+build.9"), "1.2.3");
12+
});
13+
14+
it("derives nightly metadata including the short commit sha in the release name", () => {
15+
assert.deepStrictEqual(
16+
resolveNightlyReleaseMetadata("9.9.9", "20260413", 321, "abcdef1234567890"),
17+
{
18+
baseVersion: "9.9.9",
19+
version: "9.9.9-nightly.20260413.321",
20+
tag: "nightly-v9.9.9-nightly.20260413.321",
21+
name: "T3 Code Nightly 9.9.9-nightly.20260413.321 (abcdef123456)",
22+
shortSha: "abcdef123456",
23+
},
24+
);
25+
});

‎scripts/resolve-nightly-release.ts‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,24 @@ const decodeDesktopPackageJson = Schema.decodeUnknownEffect(
2727
Schema.fromJsonString(DesktopPackageJsonSchema),
2828
);
2929

30-
const resolveNightlyBaseVersion = (version: string) => version.replace(/[-+].*$/, "");
30+
export const resolveNightlyBaseVersion = (version: string) => version.replace(/[-+].*$/, "");
3131

32-
const resolveNightlyReleaseMetadata = (
32+
export const resolveNightlyReleaseMetadata = (
3333
baseVersion: string,
3434
date: string,
3535
runNumber: number,
3636
sha: string,
37-
) => ({
38-
baseVersion,
39-
version: `${baseVersion}-nightly.${date}.${runNumber}`,
40-
tag: `nightly-v${baseVersion}-nightly.${date}.${runNumber}`,
41-
name: `T3 Code Nightly ${baseVersion}-nightly.${date}.${runNumber}`,
42-
shortSha: sha.slice(0, 12),
43-
});
37+
) => {
38+
const shortSha = sha.slice(0, 12);
39+
const version = `${baseVersion}-nightly.${date}.${runNumber}`;
40+
return {
41+
baseVersion,
42+
version,
43+
tag: `nightly-v${version}`,
44+
name: `T3 Code Nightly ${version} (${shortSha})`,
45+
shortSha,
46+
};
47+
};
4448

4549
const readDesktopBaseVersion = Effect.fn("readDesktopBaseVersion")(function* (
4650
rootDir: string | undefined,
@@ -111,7 +115,9 @@ const command = Command.make(
111115
),
112116
).pipe(Command.withDescription("Resolve nightly release version metadata."));
113117

114-
Command.run(command, { version: "0.0.0" }).pipe(
115-
Effect.provide(NodeServices.layer),
116-
NodeRuntime.runMain,
117-
);
118+
if (import.meta.main) {
119+
Command.run(command, { version: "0.0.0" }).pipe(
120+
Effect.provide(NodeServices.layer),
121+
NodeRuntime.runMain,
122+
);
123+
}

0 commit comments

Comments
 (0)