@dbx-tools/projen 0.6.196 → 0.6.198

package/README.md

@@ -403,8 +403,10 @@ a new package is covered without a re-synth. Work from the root:
 dedicated `release/v<version>` branch, invokes the pure `bump` task, validates
 the complete workspace, runs local publication, and opens a PR into the
 configured release branch. `--message` sets the source commit message. The task
-never merges the PR. npm uses `npm config get registry` and publishes to a local
-Verdaccio automatically. Publishable JavaScript members compile once
+never merges the PR unless `--approve` is passed; that option requests an
+immediate admin merge so the main release can start without waiting for PR
+checks. npm uses `npm config get registry` and publishes to a local Verdaccio
+automatically. Publishable JavaScript members compile once
 from the root in parallel, then upload through a bounded pool without rerunning
 their `prepack` tasks. Python prefers uv's default index and only
 treats a loopback `.../+simple/` URL as writable devpi; a read-only cache such as

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/projen";
-export const PACKAGE_VERSION = "0.6.196";
+export const PACKAGE_VERSION = "0.6.198";
 export * as barrels from "./src/barrels.ts";
 export * as bunApp from "./src/bun-app.ts";
 export * as bunWorkflow from "./src/bun-workflow.ts";

package/package.json

@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/core": "0.6.196",
-    "@dbx-tools/path": "0.6.196",
-    "@dbx-tools/shared-core": "0.6.196",
+    "@dbx-tools/core": "0.6.198",
+    "@dbx-tools/path": "0.6.198",
+    "@dbx-tools/shared-core": "0.6.198",
     "commander": "^15.0.0",
     "concurrently": "^10.0.3",
     "constructs": "^10.6.0",
@@ -47,7 +47,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.6.196",
+  "version": "0.6.198",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/tasks/release-pr.ts

@@ -66,6 +66,24 @@ function gitSucceeds(root: string, args: string[]): boolean {
   );
 }
 
+function commandSucceeds(
+  root: string,
+  command: string,
+  args: string[],
+  env?: NodeJS.ProcessEnv,
+): boolean {
+  return (
+    exec.spawnSync(command, args, {
+      cwd: root,
+      env,
+      stdout: "ignore",
+      stderr: "ignore",
+      stdin: "ignore",
+      check: false,
+    }).exitCode === 0
+  );
+}
+
 function run(root: string, command: string, args: string[], env?: NodeJS.ProcessEnv): void {
   exec.spawnSync(command, args, {
     cwd: root,
@@ -120,6 +138,7 @@ program
   .option("--local-pypi <value>", "local PyPI index: auto, false, or an explicit URL", "auto")
   .option("--python-root <path>", "Python workspace package root", "packages/py")
   .option("--no-local-cargo", "skip local Cargo publication")
+  .option("--approve", "merge the release PR immediately with admin bypass")
   .action(
     async (opts: {
       level: VersionLevel;
@@ -132,6 +151,7 @@ program
       localPypi: string;
       pythonRoot: string;
       localCargo: boolean;
+      approve: boolean;
     }) => {
       const root = project.root() ?? process.cwd();
       const currentBranch = git(root, ["branch", "--show-current"], { capture: true });
@@ -234,25 +254,31 @@ program
         "",
         "Merging this PR updates VERSION on main and starts the public release workflow.",
       ].join("\n");
-      run(
-        root,
-        "gh",
-        [
-          "pr",
-          "create",
-          "--base",
-          opts.base,
-          "--head",
-          releaseBranch,
-          "--title",
-          title,
-          "--body",
-          body,
-        ],
-        { ...process.env, GH_TOKEN: account.token },
-      );
+      const githubEnvironment = { ...process.env, GH_TOKEN: account.token };
+      if (!commandSucceeds(root, "gh", ["pr", "view", releaseBranch], githubEnvironment)) {
+        run(
+          root,
+          "gh",
+          [
+            "pr",
+            "create",
+            "--base",
+            opts.base,
+            "--head",
+            releaseBranch,
+            "--title",
+            title,
+            "--body",
+            body,
+          ],
+          githubEnvironment,
+        );
+      }
+      if (opts.approve) {
+        run(root, "gh", ["pr", "merge", releaseBranch, "--admin", "--merge"], githubEnvironment);
+      }
       if (!resuming) git(root, ["switch", currentBranch]);
-      logger.success(`opened ${releaseBranch} for ${releaseTag}`);
+      logger.success(`${opts.approve ? "merged" : "opened"} ${releaseBranch} for ${releaseTag}`);
     },
   );