Skip to content

Commit 42dbd32

Browse files
feat: Apply build index consistently
1 parent b2c9d87 commit 42dbd32

File tree

2 files changed

+36
-46
lines changed

2 files changed

+36
-46
lines changed

lib/main.js

Lines changed: 18 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/version.ts

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,37 @@ const bumpVersion = (rootVersion: string, level: "major" | "minor" | "patch") =>
4545
export const suggestVersions = (currentVersion: string) => {
4646
const rootVersion = getRootVersion(currentVersion);
4747
const versionExtension = getVersionExtension(currentVersion);
48-
const hash = process.env.GITHUB_SHA ? `-${String(process.env.GITHUB_SHA).substring(0, 7)}` : "";
48+
const hash = process.env.GITHUB_SHA ? String(process.env.GITHUB_SHA).substring(0, 7) : "";
4949

5050
const major = bumpVersion(rootVersion, "major");
5151
const minor = bumpVersion(rootVersion, "minor");
5252
const patch = bumpVersion(rootVersion, "patch");
53+
const index = getDateString();
5354

5455
return {
5556
current: currentVersion,
5657
root: rootVersion,
5758
extension: versionExtension,
58-
dev: [rootVersion, "-dev", "+", hash].join(""),
59-
devExtended: [rootVersion, versionExtension, "-dev", "+", hash].join(""),
60-
nightly: [rootVersion, `-nightly.${getDateString()}`, "+", hash].join(""),
61-
nightlyExtended: [rootVersion, versionExtension, `-nightly.${getDateString()}`, "+", hash].join(
59+
dev: [rootVersion, "-", "dev", ".", index, "+", hash].join(""),
60+
devExtended: [rootVersion, versionExtension, "-", "dev", ".", index, "+", hash].join(""),
61+
nightly: [rootVersion, "-", "nightly", ".", index, "+", hash].join(""),
62+
nightlyExtended: [rootVersion, versionExtension, "-", "nightly", ".", index, "+", hash].join(
6263
"",
6364
),
6465
major,
65-
majorDev: [major, "-dev", "+", hash].join(""),
66-
majorDevExtended: [major, versionExtension, "-dev", "+", hash].join(""),
67-
majorNightly: [major, `-nightly.${getDateString()}`, "+", hash].join(""),
68-
majorNightlyExtended: [major, versionExtension, `-nightly.${getDateString()}`, "+", hash].join(
69-
"",
70-
),
66+
majorDev: [major, "-", "dev", ".", index, "+", hash].join(""),
67+
majorDevExtended: [major, versionExtension, "-", "dev", ".", index, "+", hash].join(""),
68+
majorNightly: [major, "-", "nightly", ".", index, "+", hash].join(""),
69+
majorNightlyExtended: [major, versionExtension, "-", "nightly", ".", index, "+", hash].join(""),
7170
minor,
72-
minorDev: [minor, "-dev", "+", hash].join(""),
73-
minorDevExtended: [minor, versionExtension, "-dev", "+", hash].join(""),
74-
minorNightly: [minor, `-nightly.${getDateString()}`, "+", hash].join(""),
75-
minorNightlyExtended: [minor, versionExtension, `-nightly.${getDateString()}`, "+", hash].join(
76-
"",
77-
),
71+
minorDev: [minor, "-", "dev", ".", index, "+", hash].join(""),
72+
minorDevExtended: [minor, versionExtension, "-", "dev", ".", index, "+", hash].join(""),
73+
minorNightly: [minor, "-", "nightly", ".", index, "+", hash].join(""),
74+
minorNightlyExtended: [minor, versionExtension, "-", "nightly", ".", index, "+", hash].join(""),
7875
patch,
79-
patchDev: [patch, "-dev", "+", hash].join(""),
80-
patchDevExtended: [patch, versionExtension, "-dev", "+", hash].join(""),
81-
patchNightly: [patch, `-nightly.${getDateString()}`, "+", hash].join(""),
82-
patchNightlyExtended: [patch, versionExtension, `-nightly.${getDateString()}`, "+", hash].join(
83-
"",
84-
),
76+
patchDev: [patch, "-", "dev", ".", index, "+", hash].join(""),
77+
patchDevExtended: [patch, versionExtension, "-", "dev", ".", index, "+", hash].join(""),
78+
patchNightly: [patch, "-", "nightly", ".", index, "+", hash].join(""),
79+
patchNightlyExtended: [patch, versionExtension, "-", "nightly", ".", index, "+", hash].join(""),
8580
};
8681
};

0 commit comments

Comments
 (0)