@invarn/cibuild 2.5.5 → 2.5.8

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

@@ -326,10 +326,26 @@ describe('Step Implementations', () => {
             expect(result.script).toContain('ls -t "$CACHE_DIR"/"$__ci_fb_scope"-*.tar.zst');
             expect(result.script).toContain('CACHE_SOURCE=fallback_');
             expect(result.script).toContain('FALLBACK_KEY=');
-            // Fallback must NOT warm $CACHE_FILE (otherwise cache-push would skip)
-            const fallbackSection = result.script.split('__ci_fb_scope=')[1] ?? '';
+            // Fallback must NOT warm $CACHE_FILE (otherwise cache-push would skip).
+            // Both transports declare a scope, so anchor on the last one — the
+            // filesystem branch, which is the only one with a $CACHE_FILE to warm.
+            const sections = result.script.split('__ci_fb_scope=');
+            const fallbackSection = sections[sections.length - 1] ?? '';
             expect(fallbackSection).not.toContain('mv "$CACHE_FILE.tmp" "$CACHE_FILE"');
         });
+        test('asks the daemon for the scope fallback, dated, when there is no shared dir', async () => {
+            const executor = new CachePullStepExecutor();
+            const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
+            // The daemon answers the same two questions the directory listing did:
+            // which key, and how old.
+            expect(result.script).toContain('"$CIBUILD_CACHE_DAEMON/cache/scope/$__ci_fb_scope/latest"');
+            expect(result.script).toContain('CACHE_SOURCE=fallback_daemon');
+            // The 30-day cap has to survive losing `stat`, so it reads the daemon's
+            // mtime instead. Without this the cap silently disappears.
+            expect(result.script).toContain('__ci_fb_mtime');
+            expect(result.script).toContain('-le 30');
+            expect(result.script).toContain('FALLBACK_REJECTED=');
+        });
         test('should try peer dir for fallback when local has no prior tarball', async () => {
             const executor = new CachePullStepExecutor();
             const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
@@ -386,22 +402,36 @@ describe('Step Implementations', () => {
             // unauthenticated daemon isn't sent a bogus "Bearer " header.
             expect(result.script).toContain('${CIBUILD_CACHE_TOKEN:+-H "Authorization: Bearer $CIBUILD_CACHE_TOKEN"}');
         });
-        test('daemon branch is an elif after the local hit (exact-key, daemon, fallback order)', async () => {
+        test('picks its transport up front — daemon when configured, directory otherwise', async () => {
             const executor = new CachePullStepExecutor();
             const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
-            const localAt = result.script.indexOf('CACHE_SOURCE=local');
+            // The daemon is no longer a branch *within* the directory search; it is
+            // the alternative to it, chosen before any lookup happens. A runner has
+            // no cache directory to search once the mount is gone, and standalone
+            // cibuild has no daemon — the same script has to serve both.
+            const splitAt = result.script.indexOf('if [ -n "$CIBUILD_CACHE_DAEMON" ]; then');
             const daemonAt = result.script.indexOf('CACHE_SOURCE=daemon');
-            const fallbackAt = result.script.indexOf('__ci_fb_scope=');
-            expect(localAt).toBeGreaterThanOrEqual(0);
-            expect(daemonAt).toBeGreaterThan(localAt);
-            expect(fallbackAt).toBeGreaterThan(daemonAt);
+            const localAt = result.script.indexOf('CACHE_SOURCE=local');
+            expect(splitAt).toBeGreaterThanOrEqual(0);
+            expect(daemonAt).toBeGreaterThan(splitAt);
+            expect(localAt).toBeGreaterThan(daemonAt);
+        });
+        test('does not require the cache directory to exist when using the daemon', async () => {
+            const executor = new CachePullStepExecutor();
+            const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
+            // An unconditional mkdir aborts the step under errexit once the mount is
+            // gone, which is how this fails in production rather than in a test.
+            expect(result.script).toContain('[ -n "$CIBUILD_CACHE_DAEMON" ] || mkdir -p "$CACHE_DIR"');
+            expect(result.script).not.toContain('\nmkdir -p "$CACHE_DIR"');
         });
         test('routes a manual cache_key pull miss through the cache daemon', async () => {
             const executor = new CachePullStepExecutor();
             const result = await executor.execute({ cache_key: 'my-key' }, {}, testConfig);
             expect(result.script).toContain('[ -n "$CIBUILD_CACHE_DAEMON" ]');
             expect(result.script).toContain('"$CIBUILD_CACHE_DAEMON/cache/$CACHE_KEY.tar.zst"');
-            expect(result.script).toContain('CACHE_SOURCE=daemon CACHE_KEY=$CACHE_KEY');
+            // An explicit-key step reports the bare source, matching its sibling
+            // markers; the key is already fixed and echoed by the step header.
+            expect(result.script).toContain('CACHE_SOURCE=daemon');
         });
     });
     describe('CachePushStepExecutor', () => {
@@ -418,15 +448,33 @@ describe('Step Implementations', () => {
             expect(result.script).toContain('node-modules-v1');
             expect(result.script).toContain('.ci-cache');
         });
-        test('stays a local write — never PUTs to the cache daemon (ADR 0001 v1 scope)', async () => {
+        test('uploads to the daemon when one is configured, on both step forms', async () => {
             const executor = new CachePushStepExecutor();
             const manual = await executor.execute({ cache_key: 'my-key', cache_paths: ['build'] }, {}, testConfig);
             const preset = await executor.execute({ technology: 'kmm' }, {}, testConfig);
+            // This is the half that used to be missing: push wrote only to the
+            // shared directory, so removing the mount would have silently dropped
+            // every cache while still reporting success.
             for (const result of [manual, preset]) {
-                expect(result.script).not.toContain('CIBUILD_CACHE_DAEMON');
-                expect(result.script).not.toContain('CIBUILD_CACHE_TOKEN');
+                expect(result.script).toContain('-T - "$CIBUILD_CACHE_DAEMON/cache/$CACHE_KEY.tar.zst"');
+                expect(result.script).toContain('${CIBUILD_CACHE_TOKEN:+-H "Authorization: Bearer $CIBUILD_CACHE_TOKEN"}');
+                // Streamed straight out — nothing is staged on the guest, so there is
+                // no temp file to collide with a concurrent slot or orphan on failure.
+                expect(result.script).toContain('| zstd -3 | curl');
             }
         });
+        test('a failed upload warns instead of failing the build', async () => {
+            const executor = new CachePushStepExecutor();
+            const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
+            expect(result.script).toContain('Warning: failed to upload cache to the daemon');
+        });
+        test('still writes to the cache directory when no daemon is configured', async () => {
+            const executor = new CachePushStepExecutor();
+            const result = await executor.execute({ technology: 'kmm' }, {}, testConfig);
+            // Standalone cibuild has no daemon and must keep working unchanged.
+            expect(result.script).toContain('CACHE_TMP="$CACHE_FILE.$$.$RANDOM.tmp"');
+            expect(result.script).toContain('mv "$CACHE_TMP" "$CACHE_FILE"');
+        });
         test('should skip gracefully when cache_key is missing', async () => {
             const executor = new CachePushStepExecutor();
             const inputs = {

package/dist/src/yaml/types.d.ts

@@ -42,6 +42,12 @@ export interface YAMLApp {
 export interface YAMLTrigger {
     push_branch?: string;
     pull_request_source_branch?: string;
+    /**
+     * The branch a pull request is opened *against*. Matched by Invarn's
+     * trigger resolver alongside the source branch, and what the generated
+     * scaffold uses — a `"*"` here means "any pull request".
+     */
+    pull_request_target_branch?: string;
     workflow?: string;
 }
 export interface YAMLPipeline {

package/dist/src/yaml/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/yaml/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,QAAQ;IACvB,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAGD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAGD,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;CACrB;AAGD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAGD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/yaml/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,QAAQ;IACvB,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAGD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAGD,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;CACrB;AAGD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;OAIG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAGD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}

package/package.json

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