chore: sort release tags by semver

It sorts by date by default. This can make some mess with 0.13 tags.
garden-io · May 22, 2023 · 6d61c23 · 6d61c23
1 parent 05e626c
commit 6d61c23
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/scripts/draft-release-notes.ts b/scripts/draft-release-notes.ts
@@ -11,7 +11,13 @@ const gardenRoot = resolve(__dirname, "..")
 
 async function getChangelog(prevReleaseTag: string, curReleaseTag: string) {
   try {
-    return (await execa("git-chglog", [`${prevReleaseTag}..${curReleaseTag}`], { cwd: gardenRoot })).stdout
+    return (
+      await execa(
+        "git-chglog",
+        ["--tag-filter-pattern", "^\\d+\\.\\d+\\.\\d+$", "--sort", "semver", `${prevReleaseTag}..${curReleaseTag}`],
+        { cwd: gardenRoot }
+      )
+    ).stdout
   } catch (err) {
     throw new Error(`Error generating changelog: ${err}`)
   }

diff --git a/scripts/release.ts b/scripts/release.ts
@@ -285,7 +285,13 @@ async function updateChangelog(version: string) {
   const changelogPath = "./CHANGELOG.md";
   // TODO: Use readStream and pipe
   const changelog = await readFile(changelogPath)
-  const nextChangelogEntry = (await execa("git-chglog", ["--next-tag", version, version], { cwd: gardenRoot })).stdout
+  const nextChangelogEntry = (
+    await execa(
+      "git-chglog",
+      ["--tag-filter-pattern", "^\\d+\\.\\d+\\.\\d+$", "--sort", "semver", "--next-tag", version, version],
+      { cwd: gardenRoot }
+    )
+  ).stdout
   return new Promise((resolve, reject) => {
     const writeStream = createWriteStream(changelogPath)
     writeStream.write(nextChangelogEntry)