@invarn/cibuild 1.4.8 → 1.5.0

package/dist/src/yaml/steps/cache.d.ts

@@ -5,11 +5,16 @@ import { BaseStepExecutor } from './base.js';
 import type { StepDef, CIConfig } from '../../types.js';
 /**
  * Built-in cache presets per technology.
- * When `technology` is set on a cache step, the lockfile is checksummed
- * at runtime to produce the cache key, and the listed paths are cached/restored.
+ * When `technology` is set on a cache step, either the single `lockfile` is
+ * checksummed, or the list of `fingerprint` filenames is discovered and
+ * content-hashed, to produce the cache key. The listed `paths` are then
+ * cached/restored under that key.
  */
 export interface CachePreset {
-    lockfile: string;
+    /** Single lockfile path to checksum. Use for toolchains with authoritative lockfiles (Podfile.lock, package-lock.json…). */
+    lockfile?: string;
+    /** Filenames to discover+hash across the repo. Use when no single file captures the full build graph (Gradle/KMM). */
+    fingerprint?: string[];
     keyPrefix: string;
     paths: string[];
     /** Optional fallback preset name: if primary lockfile not found, use this preset's lockfile/key/paths */

package/dist/src/yaml/steps/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cache.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAUrD,CAAC;AAoBF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAsGzF,iBAAiB;CA8HhC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAuKzF,iBAAiB;CAoHhC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cache.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAkBxD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,4HAA4H;IAC5H,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sHAAsH;IACtH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAUrD,CAAC;AAgDF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAsGzF,iBAAiB;CA+HhC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YA4JzF,iBAAiB;CA0GhC"}

package/dist/src/yaml/steps/cache.js

@@ -2,17 +2,59 @@
  * Cache step implementations (cache-pull and cache-push)
  */
 import { BaseStepExecutor } from './base.js';
+/**
+ * Files that together define a Gradle/KMM build graph. Hashing these catches
+ * module additions/removals, plugin changes, and version-catalog bumps — things
+ * that invalidate reusability of the `~/.gradle/caches` contents across branches.
+ * Source file edits do NOT affect this hash; Gradle's task cache inside the
+ * tarball handles source-level reuse.
+ */
+const GRADLE_FINGERPRINT = [
+    'settings.gradle',
+    'settings.gradle.kts',
+    'build.gradle',
+    'build.gradle.kts',
+    'libs.versions.toml',
+    'gradle-wrapper.properties',
+];
 export const CACHE_PRESETS = {
     ios: { lockfile: 'Podfile.lock', keyPrefix: 'pods', paths: ['Pods'], fallback: 'spm' },
     cocoapods: { lockfile: 'Podfile.lock', keyPrefix: 'pods', paths: ['Pods'] },
     carthage: { lockfile: 'Cartfile.resolved', keyPrefix: 'carthage', paths: ['Carthage'] },
     spm: { lockfile: 'Package.resolved', keyPrefix: 'spm', paths: ['~/Library/Developer/Xcode/DerivedData/*/SourcePackages'] },
-    gradle: { lockfile: 'gradle/wrapper/gradle-wrapper.properties', keyPrefix: 'gradle', paths: ['~/.gradle/caches', '~/.gradle/wrapper/dists'] },
-    kmm: { lockfile: 'gradle/wrapper/gradle-wrapper.properties', keyPrefix: 'kmm', paths: ['~/.gradle/caches', '~/.gradle/wrapper/dists', '~/.konan'] },
+    gradle: { fingerprint: GRADLE_FINGERPRINT, keyPrefix: 'gradle', paths: ['~/.gradle/caches', '~/.gradle/wrapper/dists'] },
+    kmm: { fingerprint: GRADLE_FINGERPRINT, keyPrefix: 'kmm', paths: ['~/.gradle/caches', '~/.gradle/wrapper/dists', '~/.konan'] },
     npm: { lockfile: 'package-lock.json', keyPrefix: 'npm', paths: ['node_modules'] },
     yarn: { lockfile: 'yarn.lock', keyPrefix: 'yarn', paths: ['node_modules'] },
     dart: { lockfile: 'pubspec.lock', keyPrefix: 'dart', paths: ['.dart_tool', '.pub-cache'] },
 };
+/**
+ * Emits bash that discovers fingerprint filenames across the repo, sorts them,
+ * and hashes their concatenated names+contents into CACHE_KEY.
+ * Used by presets (Gradle, KMM) where no single lockfile captures the build graph.
+ */
+function emitFingerprintKeyCommands(preset) {
+    const fp = preset.fingerprint ?? [];
+    const escape = (s) => s.replace(/'/g, "'\\''");
+    const nameArgs = fp
+        .map((n, i) => `${i === 0 ? '' : '-o '}-name '${escape(n)}'`)
+        .join(' ');
+    return [
+        `__ci_fp_files=$(find . -type f \\( ${nameArgs} \\) \\`,
+        `  -not -path '*/build/*' \\`,
+        `  -not -path '*/.gradle/*' \\`,
+        `  -not -path '*/node_modules/*' \\`,
+        `  -not -path '*/DerivedData/*' \\`,
+        `  2>/dev/null | LC_ALL=C sort)`,
+        `if [ -n "$__ci_fp_files" ]; then`,
+        `  CHECKSUM=$(echo "$__ci_fp_files" | xargs shasum -a 256 2>/dev/null | shasum -a 256 | cut -c1-16)`,
+        `  CACHE_KEY="${escape(preset.keyPrefix)}-\${CHECKSUM}"`,
+        `else`,
+        `  echo "Warning: no fingerprint files found, using fallback cache key"`,
+        `  CACHE_KEY="${escape(preset.keyPrefix)}-no-fingerprint"`,
+        `fi`,
+    ];
+}
 /**
  * Resolves a preset with its fallback chain into a flat list of
  * {lockfile, keyPrefix, paths} entries to try in order at runtime.
@@ -139,7 +181,10 @@ export class CachePullStepExecutor extends BaseStepExecutor {
         commands.push('  find . -name "$(basename "$1")" -not -path "*/DerivedData/*" -not -path "*/.build/*" 2>/dev/null | head -1');
         commands.push('}');
         commands.push('');
-        if (chain.length === 1) {
+        if (chain.length === 1 && chain[0].fingerprint && chain[0].fingerprint.length > 0) {
+            commands.push(...emitFingerprintKeyCommands(chain[0]));
+        }
+        else if (chain.length === 1) {
             const preset = chain[0];
             commands.push(`LOCKFILE=$(__ci_find_lockfile "${this.escapeBash(preset.lockfile)}")`);
             commands.push('if [ -n "$LOCKFILE" ] && [ -f "$LOCKFILE" ]; then');
@@ -171,7 +216,6 @@ export class CachePullStepExecutor extends BaseStepExecutor {
         }
         commands.push('');
         if (isDebugMode) {
-            commands.push('echo "Lockfile: $LOCKFILE"');
             commands.push('echo "Cache key: $CACHE_KEY"');
         }
         commands.push('CACHE_FILE="$CACHE_DIR/$CACHE_KEY.tar.zst"');
@@ -342,20 +386,9 @@ export class CachePushStepExecutor extends BaseStepExecutor {
             commands.push('  echo "Paths to cache:"');
             commands.push('  printf "  %s\\n" "${PATHS_TO_CACHE[@]}"');
         }
-        // Acquire lock with shlock
-        commands.push('  LOCK_FILE="$CACHE_FILE.lock"');
-        commands.push('  __ci_lock_tries=0');
-        commands.push('  while ! shlock -f "$LOCK_FILE" -p $$; do');
-        commands.push('    __ci_lock_tries=$((__ci_lock_tries + 1))');
-        commands.push('    if [ "$__ci_lock_tries" -ge 30 ]; then');
-        commands.push('      echo "Warning: cache push lock timeout, skipping"');
-        commands.push('      rm -f "$LOCK_FILE"');
-        commands.push('      exit 0');
-        commands.push('    fi');
-        commands.push('    sleep 1');
-        commands.push('  done');
+        // Atomic write: .tmp + rename. No lock needed — runs are serialized per runner,
+        // and cross-writer races resolve to last-writer-wins without corruption.
         commands.push('  tar -cf - "${PATHS_TO_CACHE[@]}" 2>/dev/null | zstd -3 > "$CACHE_FILE.tmp" && mv "$CACHE_FILE.tmp" "$CACHE_FILE" || true');
-        commands.push('  rm -f "$LOCK_FILE"');
         commands.push('  if [ -f "$CACHE_FILE" ]; then');
         commands.push('    echo "Cache created successfully"');
         if (isDebugMode) {
@@ -391,7 +424,10 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         commands.push('  find . -name "$(basename "$1")" -not -path "*/DerivedData/*" -not -path "*/.build/*" 2>/dev/null | head -1');
         commands.push('}');
         commands.push('');
-        if (chain.length === 1) {
+        if (chain.length === 1 && chain[0].fingerprint && chain[0].fingerprint.length > 0) {
+            commands.push(...emitFingerprintKeyCommands(chain[0]));
+        }
+        else if (chain.length === 1) {
             const preset = chain[0];
             commands.push(`LOCKFILE=$(__ci_find_lockfile "${this.escapeBash(preset.lockfile)}")`);
             commands.push('if [ -n "$LOCKFILE" ] && [ -f "$LOCKFILE" ]; then');
@@ -419,7 +455,6 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         }
         commands.push('');
         if (isDebugMode) {
-            commands.push('echo "Lockfile: $LOCKFILE"');
             commands.push('echo "Cache key: $CACHE_KEY"');
         }
         commands.push('CACHE_FILE="$CACHE_DIR/$CACHE_KEY.tar.zst"');
@@ -447,21 +482,10 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         commands.push('  echo "Cache already up to date for key: $CACHE_KEY"');
         commands.push('elif [ ${#PATHS_TO_CACHE[@]} -gt 0 ]; then');
         commands.push('  echo "Caching ${#PATHS_TO_CACHE[@]} path(s)..."');
-        // Acquire lock with shlock (macOS-native, stale-lock safe via PID check)
-        commands.push('  LOCK_FILE="$CACHE_FILE.lock"');
-        commands.push('  __ci_lock_tries=0');
-        commands.push('  while ! shlock -f "$LOCK_FILE" -p $$; do');
-        commands.push('    __ci_lock_tries=$((__ci_lock_tries + 1))');
-        commands.push('    if [ "$__ci_lock_tries" -ge 30 ]; then');
-        commands.push('      echo "Warning: cache push lock timeout, skipping"');
-        commands.push('      rm -f "$LOCK_FILE"');
-        commands.push('      exit 0');
-        commands.push('    fi');
-        commands.push('    sleep 1');
-        commands.push('  done');
-        // Atomic write: compress to .tmp, then mv (peers never see half-written files)
+        // Atomic write: compress to .tmp, then mv. No lock needed — runs are
+        // serialized per runner and cross-writer races resolve to last-writer-wins
+        // without corruption. shlock was flaky on the virtiofs cache mount.
         commands.push('  tar -cf - "${PATHS_TO_CACHE[@]}" 2>/dev/null | zstd -3 > "$CACHE_FILE.tmp" && mv "$CACHE_FILE.tmp" "$CACHE_FILE" || true');
-        commands.push('  rm -f "$LOCK_FILE"');
         commands.push('  if [ -f "$CACHE_FILE" ]; then');
         commands.push('    echo "Cache created successfully"');
         if (isDebugMode) {

package/dist/src/yaml/steps/steps.test.js

@@ -138,7 +138,8 @@ describe('Step Implementations', () => {
         test('should auto-configure for gradle technology', async () => {
             const executor = new CachePullStepExecutor();
             const result = await executor.execute({ technology: 'gradle' }, {}, testConfig);
-            expect(result.script).toContain('gradle/wrapper/gradle-wrapper.properties');
+            expect(result.script).toContain("-name 'gradle-wrapper.properties'");
+            expect(result.script).toContain("-name 'build.gradle.kts'");
             expect(result.script).toContain('gradle-');
         });
         test('should auto-configure for npm technology', async () => {
@@ -174,7 +175,10 @@ describe('Step Implementations', () => {
         test('should auto-configure for kmm technology', async () => {
             const executor = new CachePullStepExecutor();
             const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
-            expect(result.script).toContain('gradle/wrapper/gradle-wrapper.properties');
+            expect(result.script).toContain("-name 'gradle-wrapper.properties'");
+            expect(result.script).toContain("-name 'settings.gradle'");
+            expect(result.script).toContain("-name 'build.gradle.kts'");
+            expect(result.script).toContain("-name 'libs.versions.toml'");
             expect(result.script).toContain('kmm-');
         });
         test('should use zstd compression format', async () => {
@@ -266,7 +270,8 @@ describe('Step Implementations', () => {
         test('should auto-configure for gradle technology', async () => {
             const executor = new CachePushStepExecutor();
             const result = await executor.execute({ technology: 'gradle' }, {}, testConfig);
-            expect(result.script).toContain('gradle/wrapper/gradle-wrapper.properties');
+            expect(result.script).toContain("-name 'gradle-wrapper.properties'");
+            expect(result.script).toContain("-name 'build.gradle.kts'");
             expect(result.script).toContain('~/.gradle/caches');
         });
         test('should auto-configure for npm technology', async () => {
@@ -285,7 +290,9 @@ describe('Step Implementations', () => {
         test('should auto-configure for kmm technology', async () => {
             const executor = new CachePushStepExecutor();
             const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
-            expect(result.script).toContain('gradle/wrapper/gradle-wrapper.properties');
+            expect(result.script).toContain("-name 'gradle-wrapper.properties'");
+            expect(result.script).toContain("-name 'settings.gradle.kts'");
+            expect(result.script).toContain("-name 'libs.versions.toml'");
             expect(result.script).toContain('kmm-');
             expect(result.script).toContain('~/.gradle/caches');
             expect(result.script).toContain('~/.gradle/wrapper/dists');
@@ -303,21 +310,18 @@ describe('Step Implementations', () => {
             const executor = new CachePushStepExecutor();
             await expect(executor.execute({ technology: 'unknown' }, {}, testConfig)).rejects.toThrow("Unknown cache technology 'unknown'");
         });
-        test('should use shlock locking for preset push', async () => {
+        test('should not use shlock (flaky on virtiofs cache mount) for preset push', async () => {
             const executor = new CachePushStepExecutor();
             const result = await executor.execute({ technology: 'cocoapods' }, {}, testConfig);
-            expect(result.script).toContain('shlock -f "$LOCK_FILE" -p $$');
-            expect(result.script).toContain('LOCK_FILE="$CACHE_FILE.lock"');
-            expect(result.script).toContain('rm -f "$LOCK_FILE"');
-            // Lock timeout after 30 retries
-            expect(result.script).toContain('__ci_lock_tries');
-            expect(result.script).toContain('-ge 30');
-        });
-        test('should use shlock locking for manual cache_key push', async () => {
+            expect(result.script).not.toContain('shlock');
+            expect(result.script).not.toContain('LOCK_FILE');
+            expect(result.script).not.toContain('__ci_lock_tries');
+        });
+        test('should not use shlock for manual cache_key push', async () => {
             const executor = new CachePushStepExecutor();
             const result = await executor.execute({ cache_key: 'my-key', cache_paths: ['build'] }, {}, testConfig);
-            expect(result.script).toContain('shlock -f "$LOCK_FILE" -p $$');
-            expect(result.script).toContain('rm -f "$LOCK_FILE"');
+            expect(result.script).not.toContain('shlock');
+            expect(result.script).not.toContain('LOCK_FILE');
         });
         test('should use atomic write (tmp + mv) for preset push', async () => {
             const executor = new CachePushStepExecutor();
@@ -325,6 +329,12 @@ describe('Step Implementations', () => {
             expect(result.script).toContain('> "$CACHE_FILE.tmp"');
             expect(result.script).toContain('mv "$CACHE_FILE.tmp" "$CACHE_FILE"');
         });
+        test('should use atomic write (tmp + mv) for manual cache_key push', async () => {
+            const executor = new CachePushStepExecutor();
+            const result = await executor.execute({ cache_key: 'my-key', cache_paths: ['build'] }, {}, testConfig);
+            expect(result.script).toContain('> "$CACHE_FILE.tmp"');
+            expect(result.script).toContain('mv "$CACHE_FILE.tmp" "$CACHE_FILE"');
+        });
     });
     describe('XcodeBuildStepExecutor', () => {
         test('should generate xcodebuild script', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "1.4.8",
+  "version": "1.5.0",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",