Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Sort double digit pre-release patch tags numerically (#83990)

Chris Vandoodewaard807ee6bba339
diff --git a/release/src/version-helpers.ts b/release/src/version-helpers.ts
index bbeb09c2cc4..4b409ae4a18 100644
--- a/release/src/version-helpers.ts
+++ b/release/src/version-helpers.ts
@@ -292,7 +292,7 @@ export function isPatchVersion(version: string) {
}
const normalizeVersionForSorting = (version: string) =>
- version.replace(/^(v?)(0|1)\./, "");
+ version.replace(/^(v?)(0|1)\./, "").replace(/-.*$/, "");
export function versionSort(a: string, b: string) {
const [aMajor, aMinor, aPatch] = normalizeVersionForSorting(a)
diff --git a/release/src/version-helpers.unit.spec.ts b/release/src/version-helpers.unit.spec.ts
index ac9d502765c..8a5d27176b4 100644
--- a/release/src/version-helpers.unit.spec.ts
+++ b/release/src/version-helpers.unit.spec.ts
@@ -509,6 +509,19 @@ describe("version-helpers", () => {
expect(latest).toBe("v0.12.4-beta");
});
+ it("should sort double digit pre release patches numerically", () => {
+ const latest = getLastReleaseFromTags({
+ tags: [
+ { ref: "refs/tags/v0.64.0-beta" },
+ { ref: "refs/tags/v0.64.0.1-beta" },
+ { ref: "refs/tags/v0.64.0.10-beta" },
+ { ref: "refs/tags/v0.64.0.2-beta" },
+ { ref: "refs/tags/v0.64.0.9-beta" },
+ ] as Tag[],
+ });
+ expect(latest).toBe("v0.64.0.10-beta");
+ });
+
it("should ignore pre releases with a flag passeed", () => {
const latest = getLastReleaseFromTags({
tags: [