@invarn/cibuild 1.5.5 → 1.5.6

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;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;AA8DF;;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;CA8KhC;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;CA6HhC"}
+{"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;AA8DF;;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;CAsLhC;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;CA2IhC"}

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

@@ -252,6 +252,10 @@ export class CachePullStepExecutor extends BaseStepExecutor {
             commands.push('  echo "Cache file size: $(du -h "$CACHE_FILE" | cut -f1)"');
         }
         commands.push('  zstd -dc "$CACHE_FILE" | tar -xf - -C /');
+        // LRU bump: lift this tarball to the top of `ls -t` so retention's age
+        // cap counts last-used time, not last-written. Without this, a tarball
+        // hit daily would still be reaped on its 31st day from creation.
+        commands.push('  touch "$CACHE_FILE"');
         commands.push('  echo "CACHE_SOURCE=local CACHE_KEY=$CACHE_KEY"');
         // 2. Peer hit — tee to warm local cache while extracting in one pass
         if (peerCacheDir) {
@@ -301,6 +305,10 @@ export class CachePullStepExecutor extends BaseStepExecutor {
             commands.push('      echo "Fallback size: $(du -h "$__ci_fb" | cut -f1)"');
         }
         commands.push('      zstd -dc "$__ci_fb" | tar -xf - -C /');
+        // LRU bump for the fallback tarball — we restored from it, so it earns
+        // its place at the top of the retention sort even if the exact-key
+        // tarball is the one that gets created in this run's cache-push.
+        commands.push('      touch "$__ci_fb"');
         commands.push('      echo "CACHE_SOURCE=fallback_$__ci_fb_src CACHE_KEY=$CACHE_KEY FALLBACK_KEY=$__ci_fb_key"');
         commands.push('    else');
         commands.push('      echo "Cache fallback candidate $__ci_fb_key is ${__ci_fb_age_days}d old, exceeds 30d cap — going cold"');
@@ -541,34 +549,48 @@ export class CachePushStepExecutor extends BaseStepExecutor {
             commands.push('fi');
         }
         commands.push('');
-        // Skip if cache already exists for this key
-        commands.push('if [ -f "$CACHE_FILE" ]; then');
-        commands.push('  echo "Cache already up to date for key: $CACHE_KEY"');
-        commands.push('elif [ ${#PATHS_TO_CACHE[@]} -gt 0 ]; then');
+        // Always re-archive on success: ~/.gradle/caches and friends are
+        // write-through accumulators — same fingerprint key does NOT imply
+        // unchanged contents (Gradle's build-cache-1 keeps appending task
+        // outputs as sources change). Skipping here would freeze the tarball
+        // at first-mint and let it drift further from current state on every
+        // build. Atomic .tmp + mv overwrites any prior tarball under this key.
+        commands.push('if [ ${#PATHS_TO_CACHE[@]} -gt 0 ]; then');
         commands.push('  echo "Caching ${#PATHS_TO_CACHE[@]} path(s)..."');
-        // 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('  if [ -f "$CACHE_FILE" ]; then');
         commands.push('    echo "Cache created successfully"');
         if (isDebugMode) {
             commands.push('    echo "Cache size: $(du -h "$CACHE_FILE" | cut -f1)"');
         }
-        // Retention: keep 5 newest tarballs per <keyPrefix>-<projectId> scope,
-        // delete older ones to bound disk usage. Runs inline after every push;
-        // no cron required.
+        // Retention per-scope: (1) keep N newest by mtime — touched on hit in
+        // cache-pull so this is LRU, not strictly creation-order; (2) delete
+        // anything past the age cap regardless of position; (3) enforce a size
+        // budget, oldest-out. Two passes are required: the size pass needs the
+        // post-cleanup set, otherwise its running sum counts tarballs that the
+        // count/age pass is about to delete and over-evicts.
         commands.push('    __ci_ret_scope="${CACHE_KEY%-*}"');
-        // `|| true` guards against pipefail when ls matches nothing (first push
-        // for a new scope) — otherwise the step would silently exit non-zero.
-        commands.push('    __ci_ret_old=$(ls -t "$CACHE_DIR"/"$__ci_ret_scope"-*.tar.zst 2>/dev/null | tail -n +6 || true)');
-        commands.push('    if [ -n "$__ci_ret_old" ]; then');
-        commands.push('      __ci_ret_count=$(printf "%s\\n" "$__ci_ret_old" | wc -l | tr -d " ")');
-        commands.push('      echo "Retention: removing $__ci_ret_count older tarball(s) from scope $__ci_ret_scope"');
-        commands.push('      printf "%s\\n" "$__ci_ret_old" | while IFS= read -r __ci_ret_f; do');
-        commands.push('        [ -f "$__ci_ret_f" ] && rm -f "$__ci_ret_f"');
-        commands.push('      done');
-        commands.push('    fi');
+        commands.push('    __ci_ret_count_cap=5');
+        commands.push('    __ci_ret_age_cap=$((30 * 86400))');
+        commands.push('    __ci_ret_size_cap_kb="${CIBUILD_CACHE_SCOPE_BUDGET_KB:-10485760}"');
+        commands.push('    __ci_ret_now=$(date +%s)');
+        commands.push('    __ci_ret_idx=0');
+        commands.push('    while IFS= read -r __ci_ret_f; do');
+        commands.push('      __ci_ret_idx=$((__ci_ret_idx + 1))');
+        commands.push('      __ci_ret_age=$(( __ci_ret_now - $(stat -f %m "$__ci_ret_f" 2>/dev/null || echo "$__ci_ret_now") ))');
+        commands.push('      if [ "$__ci_ret_idx" -gt "$__ci_ret_count_cap" ] || [ "$__ci_ret_age" -gt "$__ci_ret_age_cap" ]; then');
+        commands.push('        rm -f "$__ci_ret_f"');
+        commands.push('      fi');
+        commands.push('    done < <(ls -t "$CACHE_DIR"/"$__ci_ret_scope"-*.tar.zst 2>/dev/null)');
+        commands.push('    __ci_ret_running_kb=0');
+        commands.push('    while IFS= read -r __ci_ret_f; do');
+        commands.push('      __ci_ret_size=$(du -k "$__ci_ret_f" 2>/dev/null | cut -f1)');
+        commands.push('      __ci_ret_size=${__ci_ret_size:-0}');
+        commands.push('      __ci_ret_running_kb=$((__ci_ret_running_kb + __ci_ret_size))');
+        commands.push('      if [ "$__ci_ret_running_kb" -gt "$__ci_ret_size_cap_kb" ]; then');
+        commands.push('        rm -f "$__ci_ret_f"');
+        commands.push('      fi');
+        commands.push('    done < <(ls -t "$CACHE_DIR"/"$__ci_ret_scope"-*.tar.zst 2>/dev/null)');
         commands.push('  else');
         commands.push('    echo "Warning: Failed to create cache file"');
         commands.push('  fi');

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

@@ -379,20 +379,21 @@ describe('Step Implementations', () => {
             expect(result.script).toContain('> "$CACHE_FILE.tmp"');
             expect(result.script).toContain('mv "$CACHE_FILE.tmp" "$CACHE_FILE"');
         });
-        test('should sweep retention (keep 5 newest per scope) after successful push', async () => {
+        test('should sweep retention (count + age + size budget) after successful preset push', async () => {
             const executor = new CachePushStepExecutor();
             const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
-            // Scope = prefix + projectId; retention globs that scope and keeps 5 newest
             expect(result.script).toContain('__ci_ret_scope="${CACHE_KEY%-*}"');
             expect(result.script).toContain('ls -t "$CACHE_DIR"/"$__ci_ret_scope"-*.tar.zst');
-            expect(result.script).toContain('tail -n +6');
+            expect(result.script).toContain('__ci_ret_count_cap=5');
+            expect(result.script).toContain('__ci_ret_age_cap=$((30 * 86400))');
+            expect(result.script).toContain('CIBUILD_CACHE_SCOPE_BUDGET_KB');
             expect(result.script).toContain('rm -f "$__ci_ret_f"');
         });
         test('should not run retention for manual cache_key push (no scope)', async () => {
             const executor = new CachePushStepExecutor();
             const result = await executor.execute({ cache_key: 'my-key', cache_paths: ['build'] }, {}, testConfig);
             expect(result.script).not.toContain('__ci_ret_scope');
-            expect(result.script).not.toContain('tail -n +6');
+            expect(result.script).not.toContain('__ci_ret_count_cap');
         });
         test('should use atomic write (tmp + mv) for manual cache_key push', async () => {
             const executor = new CachePushStepExecutor();

package/package.json

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