@dbx-tools/projen 0.6.158 → 0.6.161

package/README.md

@@ -115,18 +115,23 @@ Cargo/sccache once,
 builds the Rust workspace once, then packages every discovered output from that
 shared build. Bun and the workspace install are present only when a Node binding
 needs TypeScript generation; uv is present only when a Python wheel is needed.
+A new dispatch cancels queued and in-progress release and docs workflows before
+starting, and each workflow's concurrency group also cancels its previous run.
 A binary-only workspace therefore installs neither. `rustVersion` remains the
 MSRV recorded in package manifests, while `releaseRustVersion` independently
 defaults release compilation to `stable`. UBRN uses that same release toolchain
 unless `ubrnRustVersion` explicitly selects another one.
 
-The Node generator's Rust CLI can be cached under one target directory keyed by
-its pinned UBRN version, Rust version, runner OS, and runner architecture. Set
-the repository variable `CACHE_UBRN_TARGET=true` to enable that archive while
-comparing its transfer cost with the default sccache-only path. Cargo registry
-caches and the `SCCACHE_GHA_VERSION` namespace stay stable per target/toolchain
-across version tags. Cache keys, restore results, sccache statistics, and phase
-timings are written to each build log. Python generation executes the already-built
+The final host UBRN executable is cached by pinned UBRN version, Rust toolchain,
+runner OS, and runner architecture. A hit skips both the workspace `bun install`
+and the UBRN Cargo build. Release packaging passes the cached executable directly
+to the Node binding generator and keeps the package barrel copied from source,
+so it does not need the installed projen dependency graph. A miss saves the
+validated executable immediately, before workspace build and packaging can fail.
+Cargo registry caches
+and the `SCCACHE_GHA_VERSION` namespace stay stable per target/toolchain across
+version tags. Cache keys, restore results, sccache statistics, and phase timings
+are written to each build log. Python generation executes the already-built
 `target/<triple>/release/uniffi-bindgen` directly. Artifact packaging therefore
 does no Rust compilation after the main workspace build.
 

package/package.json

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

package/src/project-py.ts

@@ -429,7 +429,11 @@ export class DBXToolsPythonWorkspace extends Component {
     if (!project.github) return;
     const publications = this.publications(options);
     if (publications.length === 0) return;
-    const workflow = new GithubWorkflow(project.github, options.workflowName ?? "python-release");
+    const workflowName = options.workflowName ?? "python-release";
+    const workflow = new GithubWorkflow(project.github, workflowName, {
+      limitConcurrency: true,
+      concurrencyOptions: { group: workflowName, cancelInProgress: true },
+    });
     workflow.file?.addOverride("permissions", {
       contents: "read",
       ...(options.upstreamWorkflow ? { actions: "read" } : {}),

package/src/project-rs.ts

@@ -641,6 +641,10 @@ export class DBXToolsRustWorkspace {
       ubrnRustVersion === releaseRustVersion
         ? ""
         : `rustup toolchain install ${ubrnRustVersion} --profile minimal\n`;
+    const ubrnExecutable =
+      "${{ github.workspace }}/.cache/ubrn/uniffi-bindgen-react-native${{ matrix.target.os == 'win32' && '.exe' || '' }}";
+    const builtUbrnExecutable =
+      "target/ubrn/debug/uniffi-bindgen-react-native${{ matrix.target.os == 'win32' && '.exe' || '' }}";
     const releaseBranch = projectReleaseBranch(project);
     const bindings = this.bindingMappings.map((binding) => ({
       ...binding,
@@ -685,7 +689,7 @@ export class DBXToolsRustWorkspace {
         `--node-package "${binding.nodePackage}"`,
         `--python-package "${binding.pythonPackage}"`,
         ...(binding.node
-          ? ['--node-generator "node_modules/@dbx-tools/projen/tasks/uniffi.ts"']
+          ? ['--node-generator "projen/tasks/uniffi.ts"', '--ubrn "$UBRN_EXECUTABLE"']
           : []),
         '--cargo-target "${{ matrix.target.cargo }}"',
         '--node-triple "${{ matrix.target.node }}"',
@@ -789,13 +793,12 @@ export class DBXToolsRustWorkspace {
         ...(hasNodeBindings
           ? [
               {
-                name: "Cache UBRN generator",
+                name: "Restore UBRN executable",
                 id: "ubrn_cache",
-                if: "${{ vars.CACHE_UBRN_TARGET == 'true' }}",
-                uses: "actions/cache@v5",
+                uses: "actions/cache/restore@v5",
                 with: {
-                  path: "target/ubrn",
-                  key: `ubrn-\${{ runner.os }}-\${{ runner.arch }}-rust-${ubrnRustVersion}-${UBRN_VERSION}`,
+                  path: ".cache/ubrn",
+                  key: `ubrn-executable-\${{ runner.os }}-\${{ runner.arch }}-rust-${ubrnRustVersion}-${UBRN_VERSION}`,
                 },
               },
             ]
@@ -811,9 +814,8 @@ export class DBXToolsRustWorkspace {
             `echo "ubrn_rust_toolchain=${ubrnRustVersion}"`,
             ...(hasNodeBindings
               ? [
-                  "echo \"ubrn_target_cache_enabled=${{ vars.CACHE_UBRN_TARGET == 'true' }}\"",
-                  `echo "ubrn_target_cache_key=ubrn-\${{ runner.os }}-\${{ runner.arch }}-rust-${ubrnRustVersion}-${UBRN_VERSION}"`,
-                  'echo "ubrn_target_cache_hit=${{ steps.ubrn_cache.outputs.cache-hit }}"',
+                  `echo "ubrn_executable_cache_key=ubrn-executable-\${{ runner.os }}-\${{ runner.arch }}-rust-${ubrnRustVersion}-${UBRN_VERSION}"`,
+                  'echo "ubrn_executable_cache_hit=${{ steps.ubrn_cache.outputs.cache-hit }}"',
                 ]
               : []),
           ].join("\n"),
@@ -827,6 +829,7 @@ export class DBXToolsRustWorkspace {
           ? [
               {
                 name: "Install Node tooling",
+                if: "${{ steps.ubrn_cache.outputs.cache-hit != 'true' }}",
                 shell: "bash",
                 run: timedBash("node_tooling", "bun install"),
               },
@@ -836,15 +839,37 @@ export class DBXToolsRustWorkspace {
           ? [
               {
                 name: "Prepare UBRN generator",
+                if: "${{ steps.ubrn_cache.outputs.cache-hit != 'true' }}",
                 env: {
                   CARGO_TARGET_DIR: "${{ github.workspace }}/target/ubrn",
+                  UBRN_EXECUTABLE: ubrnExecutable,
                 },
                 shell: "bash",
                 run: timedBash(
                   "ubrn_generator",
-                  `${ubrnToolchainInstall}cargo +${ubrnRustVersion} build --manifest-path node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/Cargo.toml`,
+                  [
+                    `${ubrnToolchainInstall}cargo +${ubrnRustVersion} build --manifest-path node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/Cargo.toml`,
+                    'mkdir -p "$(dirname "$UBRN_EXECUTABLE")"',
+                    `cp "${builtUbrnExecutable}" "$UBRN_EXECUTABLE"`,
+                    'chmod +x "$UBRN_EXECUTABLE"',
+                  ].join("\n"),
                 ),
               },
+              {
+                name: "Verify UBRN executable",
+                env: { UBRN_EXECUTABLE: ubrnExecutable },
+                shell: "bash",
+                run: 'test -f "$UBRN_EXECUTABLE"',
+              },
+              {
+                name: "Save UBRN executable",
+                if: "${{ steps.ubrn_cache.outputs.cache-hit != 'true' }}",
+                uses: "actions/cache/save@v5",
+                with: {
+                  path: ".cache/ubrn",
+                  key: "${{ steps.ubrn_cache.outputs.cache-primary-key }}",
+                },
+              },
             ]
           : []),
         {
@@ -864,7 +889,7 @@ export class DBXToolsRustWorkspace {
                   VERSION: RELEASE_TAG,
                   ...(hasNodeBindings
                     ? {
-                        CARGO_TARGET_DIR: "${{ github.workspace }}/target/ubrn",
+                        UBRN_EXECUTABLE: ubrnExecutable,
                       }
                     : {}),
                 },
@@ -990,6 +1015,10 @@ export class DBXToolsRustWorkspace {
             },
           },
         },
+        concurrency: {
+          group: workflowName,
+          "cancel-in-progress": true,
+        },
         permissions: { contents: "read" },
         jobs: {
           "verify-context": {

package/src/release.ts

@@ -4,7 +4,7 @@
  * the project has a GitHub component - authors the tag-driven npm publish
  * workflow that the pushed tag triggers.
  */
-import { rmSync } from "node:fs";
+import { existsSync, rmSync } from "node:fs";
 import { resolve } from "node:path";
 import { Component, YamlFile } from "projen";
 import { GithubWorkflow } from "projen/lib/github";
@@ -196,9 +196,23 @@ export class DBXToolsRelease extends Component {
       object.isRecord(rust) && typeof rust.releaseWorkflow === "string"
         ? RUST_RELEASE_EVENT
         : DOWNSTREAM_RELEASE_EVENT;
-    project
-      .tryFindObjectFile(".github/workflows/release-dispatch.yml")
-      ?.addOverride("jobs.dispatch.steps.1.env.RELEASE_EVENT", releaseEvent);
+    const dispatcher = project.tryFindObjectFile(".github/workflows/release-dispatch.yml");
+    dispatcher?.addOverride("jobs.dispatch.steps.1.env.RELEASE_EVENT", releaseEvent);
+    const releaseWorkflows = [
+      ...(object.isRecord(rust) && typeof rust.releaseWorkflow === "string"
+        ? [rust.releaseWorkflow]
+        : []),
+      ...(typeof project.dbxToolsConfig.pythonReleaseWorkflow === "string"
+        ? [project.dbxToolsConfig.pythonReleaseWorkflow]
+        : []),
+      ...(this.workflowName ? [this.workflowName] : []),
+      ...this.standaloneReleases.map(({ name }) => name),
+      ...(existsSync(resolve(project.outdir, ".github/workflows/docs.yml")) ? ["docs"] : []),
+    ];
+    dispatcher?.addOverride(
+      "jobs.dispatch.steps.1.env.RELEASE_WORKFLOWS",
+      [...new Set(releaseWorkflows)].join(","),
+    );
     // Release the standalone projects in the SAME run, at the same version. They
     // are not workspace members, so nothing else would ever bring them along.
     const siblingArgs = this.standaloneReleases
@@ -233,7 +247,11 @@ export class DBXToolsRelease extends Component {
       obj: {
         name: "release-dispatch",
         on: { push: { tags: [`${this.tagPrefix}*`] } },
-        permissions: { contents: "write" },
+        concurrency: {
+          group: "release-dispatch",
+          "cancel-in-progress": true,
+        },
+        permissions: { actions: "write", contents: "write" },
         jobs: {
           dispatch: {
             "runs-on": "ubuntu-latest",
@@ -250,10 +268,19 @@ export class DBXToolsRelease extends Component {
                   GH_TOKEN: "${{ github.token }}",
                   RELEASE_TAG: "${{ github.ref_name }}",
                   RELEASE_EVENT: DOWNSTREAM_RELEASE_EVENT,
+                  RELEASE_WORKFLOWS: "",
                 },
                 run: [
                   `case "$RELEASE_TAG" in ${this.tagPrefix}*) ;; *) exit 1 ;; esac`,
                   'EXPECTED_SHA="$(git rev-parse "$RELEASE_TAG^{commit}")"',
+                  'IFS="," read -r -a workflows <<< "$RELEASE_WORKFLOWS"',
+                  'for workflow in "${workflows[@]}"; do',
+                  "  for status in in_progress queued requested waiting pending action_required; do",
+                  "    while IFS= read -r run_id; do",
+                  '      if [ -n "$run_id" ]; then gh run cancel "$run_id"; fi',
+                  '    done < <(gh run list --workflow "$workflow.yml" --status "$status" --limit 100 --json databaseId --jq \'.[].databaseId\')',
+                  "  done",
+                  "done",
                   [
                     'gh api --method POST "repos/$GITHUB_REPOSITORY/dispatches"',
                     '--raw-field event_type="$RELEASE_EVENT"',
@@ -277,11 +304,10 @@ export class DBXToolsRelease extends Component {
     const setupSteps = publishSetupSteps();
     const branchDispatch = upstreamWorkflow === undefined;
     const workflow = new GithubWorkflow(project.github!, name, {
-      // Serialize publishes so two tags landing together cannot race to the
-      // registry, but never cancel a run already in flight: a half-published
-      // release is worse than a queued one.
+      // A newer release supersedes an older run even when publication has
+      // started; the dispatcher also cancels active ecosystem runs immediately.
       limitConcurrency: true,
-      concurrencyOptions: { group: name, cancelInProgress: false },
+      concurrencyOptions: { group: name, cancelInProgress: true },
     });
     // Read-only floor for any job that does not declare its own permissions;
     // the publish job below overrides it with the `id-token` it needs.

package/tasks/uniffi-release.mjs

@@ -26,6 +26,7 @@ const parsed = parseArgs({
     python: { type: "string" },
     "node-package": { type: "string" },
     "node-generator": { type: "string" },
+    ubrn: { type: "string" },
     "python-package": { type: "string" },
     "cargo-target": { type: "string" },
     "node-triple": { type: "string" },
@@ -47,9 +48,21 @@ const required = (name) => {
 };
 
 const root = resolve(parsed.values.root ?? process.cwd());
+const commandInvocation = (command, args) => {
+  if (process.platform !== "win32" || command !== "npm") return { command, args };
+  const npmCli = resolve(dirname(process.execPath), "node_modules", "npm", "bin", "npm-cli.js");
+  if (!existsSync(npmCli)) throw new Error(`Missing npm CLI ${npmCli}`);
+  return { command: process.execPath, args: [npmCli, ...args] };
+};
 const run = (command, args, cwd = root) => {
-  const result = spawnSync(command, args, { cwd, stdio: "inherit" });
-  if (result.status !== 0) throw new Error(`${command} exited with ${result.status}`);
+  const invocation = commandInvocation(command, args);
+  const result = spawnSync(invocation.command, invocation.args, { cwd, stdio: "inherit" });
+  if (result.error) {
+    throw new Error(`${invocation.command} failed: ${result.error.message}`, {
+      cause: result.error,
+    });
+  }
+  if (result.status !== 0) throw new Error(`${invocation.command} exited with ${result.status}`);
 };
 
 const replaceVersion = (source, version) =>
@@ -137,7 +150,10 @@ const packageNode = ({
     required("cargo-target"),
     "--node-package-base",
     `${nodePackage}-`,
+    "--ubrn",
+    required("ubrn"),
     "--skip-build",
+    "--skip-barrels",
   ]);
   mkdirSync(resolve(output, "npm-facade"), { recursive: true });
   run("npm", ["pack", "--pack-destination", resolve(output, "npm-facade")], facadeDirectory);

package/tasks/uniffi.ts

@@ -29,7 +29,9 @@ const { values } = parseArgs({
     python: { type: "string" },
     "cargo-target": { type: "string" },
     "node-package-base": { type: "string" },
+    ubrn: { type: "string" },
     "skip-build": { type: "boolean" },
+    "skip-barrels": { type: "boolean" },
   },
 });
 if (!values.crate || (!values.node && !values.python)) {
@@ -109,7 +111,7 @@ if (!existsSync(library)) throw new Error(`Missing compiled UniFFI library: ${li
 if (values.node) {
   const nodeSource = resolve(root, values.node, "src");
   const nodeOutput = mkdtempSync(join(tmpdir(), `${libraryName}-node-`));
-  run(join(root, "node_modules/.bin/ubrn"), [
+  run(values.ubrn ? resolve(values.ubrn) : join(root, "node_modules/.bin/ubrn"), [
     "generate",
     "napi",
     "bindings",
@@ -187,11 +189,13 @@ if (values.node) {
   }
   rmSync(resolve(root, values.node, "src/generated"), { recursive: true, force: true });
   rmSync(nodeOutput, { recursive: true, force: true });
-  run(process.execPath, [
-    resolve(dirname(fileURLToPath(import.meta.url)), "barrels.ts"),
-    "--dir",
-    resolve(root, values.node),
-  ]);
+  if (!values["skip-barrels"]) {
+    run(process.execPath, [
+      resolve(dirname(fileURLToPath(import.meta.url)), "barrels.ts"),
+      "--dir",
+      resolve(root, values.node),
+    ]);
+  }
 }
 
 if (values.python) {