versionary 1.1.0 → 1.2.0

package/dist/action/index.js

@@ -48,6 +48,24 @@ function getRemoteRefSha(cwd, ref) {
         return null;
     }
 }
+function hasVersionaryReleaseMarker(cwd, sha) {
+    try {
+        const message = runGit(cwd, ["show", "-s", "--format=%B", sha]);
+        return /^Versionary-Release:\s*true$/imu.test(message);
+    }
+    catch {
+        return false;
+    }
+}
+function isAncestor(cwd, ancestor, descendant) {
+    try {
+        runGit(cwd, ["merge-base", "--is-ancestor", ancestor, descendant]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function setOutput(name, value) {
     const outputPath = process.env.GITHUB_OUTPUT;
     if (!outputPath) {
@@ -98,26 +116,31 @@ function main() {
         hasOriginRemote(cwd)) {
         const remoteSha = getRemoteRefSha(cwd, ref);
         if (remoteSha && remoteSha !== sha) {
-            const staleMessage = `Skipping stale push run for ${sha.slice(0, 7)}; ` +
-                `${ref} now points to ${remoteSha.slice(0, 7)}.`;
-            const stalePayload = {
-                action: "stale-run-skipped",
-                message: staleMessage,
-                releaseCreated: false,
-                tagNames: [],
-            };
-            process.stdout.write(`${JSON.stringify(stalePayload)}\n`);
-            setOutput("action", stalePayload.action);
-            setOutput("message", stalePayload.message);
-            setOutput("release_created", "false");
-            setOutput("tag_name", "");
-            setOutput("tag_names", "[]");
-            setOutput("release_targets", "[]");
-            setOutput("review_url", "");
-            setOutput("review_requests", "[]");
-            setOutput("branch", "");
-            setOutput("title", "");
-            return;
+            // Descendant pushes must not turn an otherwise valid release into a
+            // recovery cycle.
+            const releaseCanPublish = hasVersionaryReleaseMarker(cwd, sha) && isAncestor(cwd, sha, remoteSha);
+            if (!releaseCanPublish) {
+                const staleMessage = `Skipping stale push run for ${sha.slice(0, 7)}; ` +
+                    `${ref} now points to ${remoteSha.slice(0, 7)}.`;
+                const stalePayload = {
+                    action: "stale-run-skipped",
+                    message: staleMessage,
+                    releaseCreated: false,
+                    tagNames: [],
+                };
+                process.stdout.write(`${JSON.stringify(stalePayload)}\n`);
+                setOutput("action", stalePayload.action);
+                setOutput("message", stalePayload.message);
+                setOutput("release_created", "false");
+                setOutput("tag_name", "");
+                setOutput("tag_names", "[]");
+                setOutput("release_targets", "[]");
+                setOutput("review_url", "");
+                setOutput("review_requests", "[]");
+                setOutput("branch", "");
+                setOutput("title", "");
+                return;
+            }
         }
     }
     const raw = execFileSync("npx", ["--yes", `versionary@${versionaryVersion}`, "run", "--json"], {

package/dist/release/changelog.js

@@ -291,7 +291,6 @@ export function prependChangelog(cwd, changelogFile, section, format = "markdown
 export function renderRNewsReleaseNotes(input) {
     const repoUrl = resolveRepositoryWebBaseUrl(input.cwd ?? process.cwd());
     const grouped = groupCommitLines(input.commits, repoUrl);
-    const normalizedVersion = input.nextVersion.replace(/\.\d+$/u, "");
     const sections = [];
     const trimmedHighlights = input.highlights?.trim() ?? "";
     if (trimmedHighlights.length > 0) {
@@ -315,7 +314,7 @@ export function renderRNewsReleaseNotes(input) {
     if (needsOtherChangesFallback(grouped, trimmedHighlights.length > 0, 0)) {
         sections.push("## Other changes", "", ...grouped.other, "");
     }
-    return [`# ${input.packageName} ${normalizedVersion}`, "", ...sections]
+    return [`# ${input.packageName} ${input.nextVersion}`, "", ...sections]
         .join("\n")
         .trimEnd();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "versionary",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Automatic release framework based on conventional commits and semantic versioning",
   "keywords": [
     "releasing",