@invarn/cibuild 1.4.9 → 1.5.0

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;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;YAuKzF,iBAAiB;CAqHhC"}
+{"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

@@ -386,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) {
@@ -493,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

@@ -310,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();
@@ -332,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.9",
+  "version": "1.5.0",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",