@dbx-tools/projen 0.6.185 → 0.6.186

package/README.md

@@ -153,10 +153,11 @@ skips matching files and fails when an existing filename has different content.
 
 The Rust matrix has one row per target. Each row installs native dependencies,
 restores Cargo and sccache once, builds the Cargo workspace once, then packages
-every discovered output from that shared build. Set a source-only crate's
-`releaseExcludeOs` package option to omit it from incompatible rows through
-Cargo `--exclude`; crates that produce UniFFI or release-binary artifacts cannot
-use this option because every configured target must produce their artifacts.
+every discovered output from that shared build. Set a source-only crate's or
+release-enabled binary's `releaseExcludeOs` package option to omit it from
+incompatible rows through Cargo `--exclude`. Release binary packaging and
+artifact upload are skipped in those rows. UniFFI crates cannot use this option
+because every configured target must produce their artifacts.
 Rust rows prepare native npm
 archives and Python wheels; they do not install Bun or UBRN and do not build
 Node facades. A binary-only row therefore installs no language package tool.

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.184";
+export const PACKAGE_VERSION = "0.6.185";
 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.185",
-    "@dbx-tools/path": "0.6.185",
-    "@dbx-tools/shared-core": "0.6.185",
+    "@dbx-tools/core": "0.6.186",
+    "@dbx-tools/path": "0.6.186",
+    "@dbx-tools/shared-core": "0.6.186",
     "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.185",
+  "version": "0.6.186",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/project-rs.ts

@@ -46,7 +46,7 @@ export interface RustPackageOptions {
   readonly private?: boolean;
   /** Build this crate's binary for each target and attach it to the GitHub release. */
   readonly release?: boolean;
-  /** Omit this source-only crate from release workspace builds on these operating systems. */
+  /** Omit this crate and any release binary artifact from these operating systems. */
   readonly releaseExcludeOs?: readonly RustReleaseOs[];
   readonly dependencies?: Readonly<Record<string, CargoDependency>>;
   readonly devDependencies?: Readonly<Record<string, CargoDependency>>;
@@ -507,9 +507,9 @@ export class DBXToolsRustWorkspace {
       rustPackageDependencies(this.packages, pkg, project.outdir, options.workspaceDependencies);
     for (const pkg of this.packages) {
       const excludedOs = new Set(pkg.packageOptions.releaseExcludeOs ?? []);
-      if (excludedOs.size && (pkg.uniffi || pkg.packageOptions.release)) {
+      if (excludedOs.size && pkg.uniffi) {
         throw new Error(
-          `${pkg.crateName} cannot set releaseExcludeOs because it produces target-specific release artifacts`,
+          `${pkg.crateName} cannot set releaseExcludeOs because UniFFI requires every configured target`,
         );
       }
       for (const dependency of packageDependencies(pkg)) {
@@ -764,6 +764,7 @@ export class DBXToolsRustWorkspace {
       .map((pkg) => ({
         crate: pkg.crateName,
         binary: pkg.packageOptions.binaryName ?? pkg.crateName,
+        excludedOs: pkg.packageOptions.releaseExcludeOs ?? [],
       }));
     const publicCrates = orderRustBindings(
       this.packages
@@ -823,18 +824,30 @@ export class DBXToolsRustWorkspace {
         "--skip-build",
       ].join(" \\\n  "),
     );
-    const binaryCommands = releaseBinaries.flatMap((pkg) => [
-      `mkdir -p "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage"`,
-      `SOURCE="target/\${{ matrix.cargo }}/release/${pkg.binary}\${{ matrix.os == 'win32' && '.exe' || '' }}"`,
-      `DESTINATION="dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage/${pkg.binary}\${{ matrix.os == 'win32' && '.exe' || '' }}"`,
-      'cp "$SOURCE" "$DESTINATION"',
-      'if [ "${{ matrix.os }}" = "win32" ]; then',
-      `  7z a "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/${pkg.binary}-\${{ matrix.node }}.zip" "$DESTINATION"`,
-      "else",
-      `  tar -C "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage" -czf "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/${pkg.binary}-\${{ matrix.node }}.tar.gz" "${pkg.binary}"`,
-      "fi",
-      `rm -rf "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage"`,
-    ]);
+    const releaseBinaryCondition = (excludedOs: readonly RustReleaseOs[]) =>
+      excludedOs.length
+        ? `\${{ ${excludedOs.map((os) => `matrix.os != '${os}'`).join(" && ")} }}`
+        : undefined;
+    const binaryCommands = releaseBinaries.flatMap((pkg) => {
+      const commands = [
+        `mkdir -p "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage"`,
+        `SOURCE="target/\${{ matrix.cargo }}/release/${pkg.binary}\${{ matrix.os == 'win32' && '.exe' || '' }}"`,
+        `DESTINATION="dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage/${pkg.binary}\${{ matrix.os == 'win32' && '.exe' || '' }}"`,
+        'cp "$SOURCE" "$DESTINATION"',
+        'if [ "${{ matrix.os }}" = "win32" ]; then',
+        `  7z a "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/${pkg.binary}-\${{ matrix.node }}.zip" "$DESTINATION"`,
+        "else",
+        `  tar -C "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage" -czf "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/${pkg.binary}-\${{ matrix.node }}.tar.gz" "${pkg.binary}"`,
+        "fi",
+        `rm -rf "dist/release/${pkg.crate}/\${{ matrix.node }}/binary/stage"`,
+      ];
+      const excludedCondition = pkg.excludedOs
+        .map((os) => `[ "\${{ matrix.os }}" != "${os}" ]`)
+        .join(" && ");
+      return excludedCondition
+        ? [`if ${excludedCondition}; then`, ...commands.map((command) => `  ${command}`), "fi"]
+        : commands;
+    });
     const artifactSteps: JobStep[] = [
       ...bindings.flatMap((binding) => [
         ...(binding.node
@@ -867,6 +880,9 @@ export class DBXToolsRustWorkspace {
       ...releaseBinaries.map((pkg) => ({
         name: `Upload ${pkg.crate} release binary`,
         uses: "actions/upload-artifact@v7",
+        ...(releaseBinaryCondition(pkg.excludedOs)
+          ? { if: releaseBinaryCondition(pkg.excludedOs) }
+          : {}),
         with: {
           name: `${pkg.crate}-\${{ matrix.node }}-binary`,
           path: `dist/release/${pkg.crate}/\${{ matrix.node }}/binary/*`,

package/tasks/bump.ts

@@ -330,7 +330,7 @@ program
             "-m",
             "🌸 Shipped with Kanna — https://kanna.sh",
             "-m",
-            "Co-Authored-By: Kanna <noreply@kanna.sh>\nKanna-Agent: codex/gpt",
+            "Co-Authored-By: Kanna <noreply@kanna.sh>\nKanna-Agent: codex/databricks-gpt-5-6-sol",
           ]);
         } else {
           logger.info("nothing to commit");