@dbx-tools/projen 0.6.149 → 0.6.151

package/package.json

@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/core": "0.6.149",
-    "@dbx-tools/path": "0.6.149",
-    "@dbx-tools/shared-core": "0.6.149",
+    "@dbx-tools/core": "0.6.151",
+    "@dbx-tools/path": "0.6.151",
+    "@dbx-tools/shared-core": "0.6.151",
     "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.149",
+  "version": "0.6.151",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/project-py.ts

@@ -515,7 +515,7 @@ export class DBXToolsPythonWorkspace extends Component {
       "",
       `- Confirm that the active PyPI account is ${repository.owner}.`,
       "- Start at https://pypi.org/manage/projects/ and determine which listed projects exist.",
-      "- Inspect every existing GitHub publisher for each project and compare its repository owner, repository name, workflow filename, and environment with the desired values below.",
+      "- Inspect every existing GitHub publisher for each project and compare its owner, repository name, workflow name, and environment name with the desired values below.",
       "- Identify duplicate and mismatched trusted publishers that must be replaced by removing the publisher entry and adding the correct one.",
       "- For projects that do not exist, identify the pending publisher that must be created.",
       "- Report the active account and a proposed reconciliation plan grouped by publishers that will be left unchanged, updated, replaced, created, or removed.",
@@ -556,13 +556,10 @@ export class DBXToolsPythonWorkspace extends Component {
         const workflowName = `${publication.workflowName}.yml`;
         return [
           `## ${publication.distribution}`,
-          `- PyPI project: ${publication.distribution}`,
-          `- GitHub repository: ${repository.owner}/${repository.name}`,
-          `- Repository owner: ${repository.owner}`,
+          `- Owner: ${repository.owner}`,
           `- Repository name: ${repository.name}`,
-          `- GitHub environment: ${publication.environment}`,
-          `- Workflow filename: ${workflowName}`,
-          `- Workflow path: .github/workflows/${workflowName}`,
+          `- Workflow name: ${workflowName}`,
+          `- Environment name: ${publication.environment}`,
           ...(publication.artifacts ? [`- Artifacts: ${publication.artifacts}`] : []),
           "",
         ];

package/src/project-rs.ts

@@ -142,11 +142,16 @@ const RUST_CACHE_ENV = {
 
 function rustCacheSteps(sharedKey: string): readonly Record<string, unknown>[] {
   return [
-    { name: "Setup sccache", uses: "mozilla-actions/sccache-action@v0.0.9" },
+    { name: "Setup sccache", uses: "mozilla-actions/sccache-action@v0.0.11" },
     {
       name: "Cache Cargo registry",
-      uses: "Swatinem/rust-cache@v2",
-      with: { "cache-targets": false, "shared-key": sharedKey },
+      uses: "Swatinem/rust-cache@v2.9.2",
+      with: {
+        "cache-targets": false,
+        "add-job-id-key": false,
+        "add-rust-environment-hash-key": false,
+        "shared-key": sharedKey,
+      },
     },
   ];
 }
@@ -408,7 +413,7 @@ export class DBXToolsRustWorkspace {
         private: true,
         trustedPublisher: {
           workflowName: options.releaseWorkflowName ?? "rust-release",
-          environment: `native-${pkg.crateName}`,
+          environment: `pypi-${pkg.crateName}`,
           artifacts: `platform-specific wheels for ${releaseTargets(options)
             .map((target) => `${target.os}-${target.cpu}`)
             .join(", ")}; all architectures publish to this one PyPI project`,
@@ -441,12 +446,12 @@ export class DBXToolsRustWorkspace {
       node.package.addField("private", true);
       node.package.file.addDeletionOverride("publishConfig");
       node.package.addField("description", `Node bindings for ${binding.crateName}`);
-      const releaseTargets = options.releaseTargets ?? UNIFFI_RELEASE_TARGETS;
+      const nativeTargets = releaseTargets(options);
       if (options.release ?? true) {
         node.package.addField(
           "optionalDependencies",
           Object.fromEntries(
-            releaseTargets.map((target) => [
+            nativeTargets.map((target) => [
               `@${string.toSlug(options.scope)}/${directory}-${target.node}`,
               readWorkspaceVersion(project.outdir),
             ]),
@@ -575,7 +580,7 @@ export class DBXToolsRustWorkspace {
           uses: "dtolnay/rust-toolchain@stable",
           with: { targets: "${{ matrix.target.cargo }}" },
         },
-        ...rustCacheSteps("uniffi-${{ matrix.target.cargo }}"),
+        ...rustCacheSteps("release-${{ matrix.target.cargo }}"),
         {
           name: "Install Linux native dependencies",
           if: "${{ matrix.target.os == 'linux' }}",
@@ -616,7 +621,7 @@ export class DBXToolsRustWorkspace {
           uses: "dtolnay/rust-toolchain@stable",
           with: { targets: "${{ matrix.target.cargo }}" },
         },
-        ...rustCacheSteps("binary-${{ matrix.target.cargo }}"),
+        ...rustCacheSteps("release-${{ matrix.target.cargo }}"),
         {
           name: "Install Linux native dependencies",
           if: "${{ matrix.target.os == 'linux' }}",
@@ -679,7 +684,7 @@ export class DBXToolsRustWorkspace {
                   "runs-on": "ubuntu-latest",
                   strategy: { matrix: { binding: bindings } },
                   permissions: { contents: "read", "id-token": "write" },
-                  environment: { name: "native-${{ matrix.binding.crate }}" },
+                  environment: { name: "pypi-${{ matrix.binding.crate }}" },
                   steps: [
                     { name: "Checkout", uses: "actions/checkout@v6" },
                     {

package/tasks/bump.ts

@@ -67,7 +67,11 @@ import {
 
 const logger = log.logger("projen:bump");
 const LEVELS = ["patch", "minor", "major"] as const;
+const RELEASE_OSES = ["darwin", "linux", "win32"] as const;
+const RELEASE_ARCHES = ["arm64", "x64"] as const;
 type Level = (typeof LEVELS)[number];
+type ReleaseOs = (typeof RELEASE_OSES)[number];
+type ReleaseArch = (typeof RELEASE_ARCHES)[number];
 
 /** A standalone in-repo project released alongside the root, on its own tag prefix. */
 interface Sibling {
@@ -89,6 +93,10 @@ function parseSibling(value: string, previous: Sibling[]): Sibling[] {
   return [...previous, { dir: value.slice(0, at), prefix: value.slice(at + 1) }];
 }
 
+function collectValue<T extends string>(value: T, previous: T[]): T[] {
+  return [...previous, value];
+}
+
 function increment(v: Semver, level: Level): Semver {
   if (level === "major") return [v[0] + 1, 0, 0];
   if (level === "minor") return [v[0], v[1] + 1, 0];
@@ -174,6 +182,18 @@ program
     parseSibling,
     [] as Sibling[],
   )
+  .addOption(
+    new Option("--os <os>", "release operating system, repeatable; crossed with every --arch")
+      .choices([...RELEASE_OSES])
+      .argParser((value, previous: ReleaseOs[]) => collectValue(value as ReleaseOs, previous))
+      .default([] as ReleaseOs[]),
+  )
+  .addOption(
+    new Option("--arch <arch>", "release CPU architecture, repeatable; crossed with every --os")
+      .choices([...RELEASE_ARCHES])
+      .argParser((value, previous: ReleaseArch[]) => collectValue(value as ReleaseArch, previous))
+      .default([] as ReleaseArch[]),
+  )
   // Declared in the `--no-` form so commander creates a boolean that defaults to
   // `true` and is turned off by `--no-synth` / `--no-version` / ... (the
   // positive `--synth` etc. also work and are no-ops on the default).
@@ -200,6 +220,8 @@ program
       level: Level;
       prefix: string;
       sibling: Sibling[];
+      os: ReleaseOs[];
+      arch: ReleaseArch[];
       synth: boolean;
       version: boolean;
       commit: boolean;
@@ -212,6 +234,9 @@ program
     }) => {
       const pkgPath = resolve(process.cwd(), "package.json");
       if (!existsSync(pkgPath)) throw new Error(`no package.json in ${process.cwd()}`);
+      if ((opts.os.length === 0) !== (opts.arch.length === 0)) {
+        throw new Error("--os and --arch must be used together");
+      }
 
       const siblings = opts.sibling.map((s) => ({ ...s, pkgPath: resolve(s.dir, "package.json") }));
       for (const s of siblings) {
@@ -260,12 +285,19 @@ program
 
       if (opts.synth) {
         logger.info("synthesizing (projen)");
+        const releasePlatforms = opts.os
+          .flatMap((os) => opts.arch.map((arch) => `${os}:${arch}`))
+          .join(",");
         exec.spawnSync("bun", [".projenrc.ts"], {
           cwd: process.cwd(),
           stdout: "inherit",
           stderr: "inherit",
           stdin: "ignore",
           check: true,
+          env: {
+            ...process.env,
+            ...(releasePlatforms ? { DBX_TOOLS_RELEASE_PLATFORMS: releasePlatforms } : {}),
+          },
         });
       }