@zackees/soldr 0.7.101 → 0.7.102

package/contracts/zccache-runtime.v1.json

@@ -9,24 +9,15 @@
     "sha256_algorithm": "sha256",
     "required_binaries": [
       "soldr",
-      "zccache",
-      "zccache-daemon",
-      "zccache-fp",
       "crgx",
       "cargo-chef"
     ],
     "linux_zccache_target_libc": "musl"
   },
   "zccache": {
-    "managed_version": "1.12.12",
-    "local_dir_env": "SOLDR_ZCCACHE_LOCAL_DIR",
-    "cache_dir_env": "ZCCACHE_CACHE_DIR",
-    "required_binaries": [
-      "zccache",
-      "zccache-daemon",
-      "zccache-fp"
-    ],
-    "manifest_block": "zccache"
+    "embedded": true,
+    "note": "zccache ships as a compiled-in soldr `[[bin]]` (soldr#1368); no managed download.",
+    "cache_dir_env": "ZCCACHE_CACHE_DIR"
   },
   "crgx": {
     "managed_version": "0.1.0",

package/package.json

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

package/scripts/test-npm-package.js

@@ -128,11 +128,9 @@ assert.deepStrictEqual(
   install.BUNDLED_BINARIES,
   zccacheContract.RELEASE_BUNDLED_BINARIES,
 );
-assert.deepStrictEqual(zccacheContract.ZCCACHE_BUNDLED_BINARIES, [
-  "zccache",
-  "zccache-daemon",
-  "zccache-fp",
-]);
+// zccache is compiled into soldr (soldr#1368) — the standalone trio is no
+// longer bundled or downloaded.
+assert.deepStrictEqual(zccacheContract.ZCCACHE_BUNDLED_BINARIES, []);
 assert.strictEqual(zccacheContract.CRGX_BUNDLED_BINARY, "crgx");
 assert.strictEqual(zccacheContract.CARGO_CHEF_BUNDLED_BINARY, "cargo-chef");
 assert.deepStrictEqual(
@@ -167,21 +165,15 @@ for (const [key, target] of Object.entries(install.TARGETS || {})) {
   );
 }
 
-// BUNDLED_BINARIES must include soldr, the zccache trio, crgx, and cargo-chef.
-// Locks the per-archive layout contract so a future bundling
+// BUNDLED_BINARIES must include soldr, crgx, and cargo-chef. zccache is
+// compiled into soldr (soldr#1368), so the standalone trio is no longer
+// bundled. Locks the per-archive layout contract so a future bundling
 // refactor can't quietly drop a binary.
 assert.ok(
   Array.isArray(install.BUNDLED_BINARIES),
   "install.BUNDLED_BINARIES must be exported as an array",
 );
-for (const required of [
-  "soldr",
-  "zccache",
-  "zccache-daemon",
-  "zccache-fp",
-  "crgx",
-  "cargo-chef",
-]) {
+for (const required of ["soldr", "crgx", "cargo-chef"]) {
   assert.ok(
     install.BUNDLED_BINARIES.includes(required),
     `BUNDLED_BINARIES must include "${required}" (got ${JSON.stringify(install.BUNDLED_BINARIES)})`,

package/scripts/zccache-contract.js

@@ -13,7 +13,11 @@ const ARCHIVE_EXT = CONTRACT.release_archive.extension;
 const MANIFEST_NAME = CONTRACT.release_archive.manifest_name;
 const MANIFEST_MIN_SCHEMA_VERSION = CONTRACT.release_archive.manifest_min_schema_version;
 const RELEASE_BUNDLED_BINARIES = Object.freeze([...CONTRACT.release_archive.required_binaries]);
-const ZCCACHE_BUNDLED_BINARIES = Object.freeze([...CONTRACT.zccache.required_binaries]);
+// zccache is compiled into soldr (soldr#1368); no standalone zccache
+// binaries are bundled or downloaded, so this list is empty.
+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];
 
@@ -75,10 +79,8 @@ function validateReleaseManifest(manifest, options) {
   if (!manifest.soldr || manifest.soldr.target !== soldrTarget) {
     throw new Error(`release manifest soldr.target must be ${soldrTarget}`);
   }
-  const expectedZccacheTarget = zccacheTargetForSoldrTarget(soldrTarget);
-  if (!manifest.zccache || manifest.zccache.target !== expectedZccacheTarget) {
-    throw new Error(`release manifest zccache.target must be ${expectedZccacheTarget}`);
-  }
+  // zccache is compiled into soldr (soldr#1368) — no standalone zccache
+  // block is required in the release manifest anymore.
   if (!manifest.crgx || manifest.crgx.target !== soldrTarget) {
     throw new Error(`release manifest crgx.target must be ${soldrTarget}`);
   }