@zackees/soldr 0.7.42 → 0.7.43

package/bin/soldr.js

@@ -55,6 +55,19 @@ if (
   childEnv[crgxLocalDirEnv] = nativeDir;
 }
 
+// Same wiring for bundled cargo-chef. `soldr cook` invokes
+// `soldr cargo chef ...`, whose resolver checks
+// SOLDR_CARGO_CHEF_LOCAL_DIR before GitHub Releases. This avoids a
+// live upstream lookup on targets cargo-chef does not publish, such as
+// macOS arm64.
+const cargoChefLocalDirEnv = zccacheContract.CONTRACT.cargo_chef.local_dir_env;
+if (
+  !childEnv[cargoChefLocalDirEnv] &&
+  fs.existsSync(path.join(nativeDir, `${zccacheContract.CARGO_CHEF_BUNDLED_BINARY}${exeExt}`))
+) {
+  childEnv[cargoChefLocalDirEnv] = nativeDir;
+}
+
 const child = childProcess.spawn(binaryPath, process.argv.slice(2), {
   stdio: "inherit",
   env: childEnv,

package/contracts/zccache-runtime.v1.json

@@ -5,14 +5,15 @@
     "extension": "tar.zst",
     "compression_level": 19,
     "manifest_name": "manifest.json",
-    "manifest_min_schema_version": 2,
+    "manifest_min_schema_version": 3,
     "sha256_algorithm": "sha256",
     "required_binaries": [
       "soldr",
       "zccache",
       "zccache-daemon",
       "zccache-fp",
-      "crgx"
+      "crgx",
+      "cargo-chef"
     ],
     "linux_zccache_target_libc": "musl"
   },
@@ -35,6 +36,14 @@
     ],
     "manifest_block": "crgx"
   },
+  "cargo_chef": {
+    "managed_version": "0.1.73",
+    "local_dir_env": "SOLDR_CARGO_CHEF_LOCAL_DIR",
+    "required_binaries": [
+      "cargo-chef"
+    ],
+    "manifest_block": "cargo_chef"
+  },
   "setup_action": {
     "cache_root_env": "SOLDR_CACHE_DIR",
     "native_cache_env": "SOLDR_NATIVE_CACHE",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zackees/soldr",
-  "version": "0.7.42",
+  "version": "0.7.43",
   "description": "Instant Rust tools and builds from one command.",
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/zackees/soldr",

package/scripts/install.js

@@ -15,8 +15,9 @@ const PACKAGE_JSON = require(path.join(PACKAGE_ROOT, "package.json"));
 
 // Every release ships a single .tar.zst per target that bundles soldr
 // alongside its matching-target zccache trio (zccache, zccache-daemon,
-// zccache-fp) and a same-target crgx. One fetch installs everything,
-// and `bin/soldr.js` wires SOLDR_ZCCACHE_LOCAL_DIR + SOLDR_CRGX_LOCAL_DIR
+// zccache-fp), same-target crgx, and same-target cargo-chef. One fetch
+// installs everything, and `bin/soldr.js` wires SOLDR_ZCCACHE_LOCAL_DIR,
+// SOLDR_CRGX_LOCAL_DIR, and SOLDR_CARGO_CHEF_LOCAL_DIR
 // to the install dir so soldr's runtime resolver finds the sibling binaries
 // without going through the managed-download path.
 const ARCHIVE_EXT = zccacheContract.ARCHIVE_EXT;
@@ -35,7 +36,8 @@ const TARGETS = {
 // Files we expect to find at the root of every extracted release
 // archive. Names line up with what `release-auto.yml`'s
 // `Fetch matched zccache release`, `Stage soldr binary`, and
-// `Build crgx from pinned source` steps drop into `dist/package/`
+// `Build crgx from pinned source`, and `Build cargo-chef from pinned
+// source` steps drop into `dist/package/`
 // before the tar.zst is built. `.exe` suffix is appended at install
 // time based on `target.binary`.
 const BUNDLED_BINARIES = zccacheContract.RELEASE_BUNDLED_BINARIES;
@@ -249,10 +251,10 @@ async function install() {
     fs.mkdirSync(nativeDir, { recursive: true });
 
     // Copy every bundled binary so soldr's runtime resolver can find
-    // its sibling zccache via SOLDR_ZCCACHE_LOCAL_DIR and crgx via
-    // SOLDR_CRGX_LOCAL_DIR (both wired up by `bin/soldr.js` before
-    // exec). The archive layout is flat — all five binaries live at
-    // the archive root.
+    // its sibling zccache via SOLDR_ZCCACHE_LOCAL_DIR, crgx via
+    // SOLDR_CRGX_LOCAL_DIR, and cargo-chef via SOLDR_CARGO_CHEF_LOCAL_DIR.
+    // `bin/soldr.js` wires these env vars before exec. The archive
+    // layout is flat: all bundled binaries live at the archive root.
     const binaryExt = target.binary.endsWith(".exe") ? ".exe" : "";
     const manifestSrc = findExtractedBinary(extractDir, zccacheContract.MANIFEST_NAME);
     if (!manifestSrc) {
@@ -289,7 +291,7 @@ async function install() {
     fs.copyFileSync(manifestSrc, path.join(nativeDir, zccacheContract.MANIFEST_NAME));
 
     console.log(
-      `soldr: installed ${target.triple} (soldr + zccache trio + crgx) into ${nativeDir}`,
+      `soldr: installed ${target.triple} (soldr + zccache trio + crgx + cargo-chef) into ${nativeDir}`,
     );
   } finally {
     fs.rmSync(tmp, { recursive: true, force: true });

package/scripts/test-npm-package.js

@@ -133,6 +133,8 @@ assert.deepStrictEqual(zccacheContract.ZCCACHE_BUNDLED_BINARIES, [
   "zccache-daemon",
   "zccache-fp",
 ]);
+assert.strictEqual(zccacheContract.CRGX_BUNDLED_BINARY, "crgx");
+assert.strictEqual(zccacheContract.CARGO_CHEF_BUNDLED_BINARY, "cargo-chef");
 assert.ok(
   fs.existsSync(path.join(root, "contracts", "zccache-integration-guardrails.v1.json")),
   "npm package must include the zccache integration guardrail contract",
@@ -157,7 +159,7 @@ for (const [key, target] of Object.entries(install.TARGETS || {})) {
   );
 }
 
-// BUNDLED_BINARIES must include soldr, the zccache trio, and crgx.
+// BUNDLED_BINARIES must include soldr, the zccache trio, crgx, and cargo-chef.
 // Locks the per-archive layout contract so a future bundling
 // refactor can't quietly drop a binary.
 assert.ok(
@@ -170,6 +172,7 @@ for (const required of [
   "zccache-daemon",
   "zccache-fp",
   "crgx",
+  "cargo-chef",
 ]) {
   assert.ok(
     install.BUNDLED_BINARIES.includes(required),

package/scripts/zccache-contract.js

@@ -15,6 +15,7 @@ const MANIFEST_MIN_SCHEMA_VERSION = CONTRACT.release_archive.manifest_min_schema
 const RELEASE_BUNDLED_BINARIES = Object.freeze([...CONTRACT.release_archive.required_binaries]);
 const ZCCACHE_BUNDLED_BINARIES = Object.freeze([...CONTRACT.zccache.required_binaries]);
 const CRGX_BUNDLED_BINARY = CONTRACT.crgx.required_binaries[0];
+const CARGO_CHEF_BUNDLED_BINARY = CONTRACT.cargo_chef.required_binaries[0];
 
 function binaryName(baseName, platform = process.platform) {
   return `${baseName}${platform === "win32" ? ".exe" : ""}`;
@@ -50,6 +51,9 @@ function collectManifestBinaries(manifest) {
   if (manifest.crgx && manifest.crgx.binary && manifest.crgx.sha256) {
     binaries.set(manifest.crgx.binary, manifest.crgx.sha256);
   }
+  if (manifest.cargo_chef && manifest.cargo_chef.binary && manifest.cargo_chef.sha256) {
+    binaries.set(manifest.cargo_chef.binary, manifest.cargo_chef.sha256);
+  }
   return binaries;
 }
 
@@ -71,6 +75,9 @@ function validateReleaseManifest(manifest, options) {
   if (!manifest.crgx || manifest.crgx.target !== soldrTarget) {
     throw new Error(`release manifest crgx.target must be ${soldrTarget}`);
   }
+  if (!manifest.cargo_chef || manifest.cargo_chef.target !== soldrTarget) {
+    throw new Error(`release manifest cargo_chef.target must be ${soldrTarget}`);
+  }
 
   const expectedNames = releaseBinaryNames(platform);
   const manifestBinaries = collectManifestBinaries(manifest);
@@ -94,6 +101,7 @@ module.exports = {
   ARCHIVE_EXT,
   CONTRACT,
   CONTRACT_PATH,
+  CARGO_CHEF_BUNDLED_BINARY,
   CRGX_BUNDLED_BINARY,
   MANIFEST_NAME,
   RELEASE_BUNDLED_BINARIES,