@sous-io/sous 0.2.0 → 0.2.2

package/src/commands/repo/release.ts

@@ -77,7 +77,8 @@ const RELEASE_REMOTE = "origin";
  *
  * Two presets sit on top of it. `--check` is read-only and is what a pull
  * request runs; `--ci` is the non-interactive form a merge runs, which bumps
- * nothing because the version was raised in the change being merged.
+ * nothing because the version was raised in the change being merged, and which
+ * accepts the plan it prints because there is nobody there to accept it.
  */
 export default class RepoRelease extends Command {
   static description =
@@ -106,7 +107,8 @@ export default class RepoRelease extends Command {
     }),
     ci: Flags.boolean({
       description:
-        "Run the way a merge does: never bump, never ask, and fail on anything unbumped",
+        "Run the way a merge does: never bump, accept the plan, never ask, and fail on " +
+        "anything unbumped",
       default: false,
     }),
     namespace: Flags.string({
@@ -156,10 +158,14 @@ export default class RepoRelease extends Command {
     const { flags } = await this.parse(RepoRelease);
     const dryRun = flags["dry-run"];
     const ci = flags.ci;
-    // The CI preset is exactly two settings: never raise a version, and never
-    // ask. It deliberately does NOT imply --push; the workflow passes that
-    // itself, so what gets pushed is visible in the workflow file.
+    // The CI preset is exactly three settings: never raise a version, accept
+    // the plan it prints, and never ask. Accepting the plan is part of the
+    // preset because there is nobody to ask: a run that only refused to ask
+    // would fail on the very confirmation the preset exists to answer. It
+    // deliberately does NOT imply --push; the workflow passes that itself, so
+    // what gets pushed is visible in the workflow file.
     const noBump = flags["no-bump"] || ci;
+    const accepted = flags.yes || ci;
     const interactive = ci ? false : isInteractive();
 
     assertFlagsAgree({ ...flags, noBump });
@@ -222,7 +228,7 @@ export default class RepoRelease extends Command {
 
     // --- Confirm ----------------------------------------------------------
 
-    if (!flags.yes) {
+    if (!accepted) {
       if (!interactive) {
         throw nonInteractiveError({
           prompt: "whether to publish the versions listed above",
@@ -232,8 +238,8 @@ export default class RepoRelease extends Command {
         });
       }
       blankLine();
-      const accepted = await askYesNo("Publish these versions?");
-      if (!accepted) {
+      const answer = await askYesNo("Publish these versions?");
+      if (!answer) {
         blankLine();
         log("  Nothing was written.");
         footer();

package/src/lib/repos/scaffold/templates.ts

@@ -332,12 +332,14 @@ export function buildReleaseWorkflow(): string {
 #   declare. It only reads; it never writes, commits or tags. That makes it the
 #   right thing to run on a pull request.
 #
-#   'sous repo release --ci --push' does the same validation and then publishes.
-#   '--ci' raises no versions and asks no questions: the version bump belongs in
-#   the change being merged, so a recipe that changed without one fails here
-#   rather than being given a version nobody reviewed. It cuts an annotated tag
-#   for every version that does not have one yet, dependency-first, and '--push'
-#   pushes the commit and those tags.
+#   'sous repo release --ci --push --yes' does the same validation and then
+#   publishes. '--ci' raises no versions, accepts the plan it prints, and asks
+#   no questions: the version bump belongs in the change being merged, so a
+#   recipe that changed without one fails here rather than being given a version
+#   nobody reviewed. It cuts an annotated tag for every version that does not
+#   have one yet, dependency-first, and '--push' pushes the commit and those
+#   tags. '--ci' implies '--yes'; passing it as well keeps this workflow working
+#   with a sous old enough that it did not.
 
 name: sous release
 
@@ -385,7 +387,7 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
       - name: Publish every new version
-        run: npx --yes @sous-io/sous repo release --ci --push
+        run: npx --yes @sous-io/sous repo release --ci --push --yes
 `;
 }