@invarn/cibuild 2.7.9 → 2.8.0

package/dist/src/yaml/steps/xcode-app-product.js

@@ -0,0 +1,247 @@
+/**
+ * Which built `.app` belongs to the scheme that was built.
+ *
+ * A simulator build leaves every application bundle its graph produced under
+ * `DerivedData/Build/Products/<configuration>-<platform>/`, and a scheme that
+ * builds a watchOS or tvOS companion alongside the app produces two. Taking
+ * whichever one a directory scan reaches first is a coin toss, and it lands the
+ * wrong way often enough to matter: a project whose scheme builds both an iOS
+ * app and a watch companion exported the 588 KB watch bundle as the app under
+ * test. The build was green, the artifact manifest was non-empty, and the
+ * thing a user downloaded could not be installed on the device they built for.
+ * That is worse than delivering nothing, because nothing is visibly wrong and
+ * a plausible wrong answer is not.
+ *
+ * The scheme already knows. A shared `.xcscheme` lists its build entries with a
+ * `BuildableName` whose extension IS the product type, and `buildForRunning`
+ * separates what the scheme builds from what it merely references — a scheme
+ * may list several `.app` entries it does not build, so "mentions an app" is
+ * not the question and a check that asked it would pick just as badly.
+ *
+ * Where the scheme gives no answer this falls back rather than failing. A
+ * project with no shared scheme at all is ordinary — plenty of them never
+ * commit one — and those builds work. Absence of evidence is not evidence, so
+ * the destination's own platform directory decides, and failing to resolve an
+ * app is left to the caller's existing guard.
+ *
+ * The whole resolver runs on the machine that did the build, against the
+ * products that build actually produced, so it needs nothing from the step
+ * generator but the scheme name and the destination.
+ */
+/**
+ * The SDK suffix the Products directory carries for a given destination.
+ *
+ * `-destination 'generic/platform=iOS Simulator'` builds into
+ * `Debug-iphonesimulator`; the watchOS and tvOS spellings are the ones that
+ * matter here, because a companion target is exactly what produces the second
+ * bundle this resolver exists to skip past.
+ */
+export function platformSuffixForDestination(destination) {
+    const d = String(destination ?? '').toLowerCase();
+    if (d.includes('watchos'))
+        return '-watchsimulator';
+    if (d.includes('tvos'))
+        return '-appletvsimulator';
+    if (d.includes('visionos') || d.includes('xros'))
+        return '-xrsimulator';
+    return '-iphonesimulator';
+}
+/**
+ * The application bundles a scheme's build action actually builds.
+ *
+ * `buildForRunning="NO"` entries are listed and not built. A scheme can carry
+ * three `.app` entries that are API-compatibility testers in other containers
+ * beside the one framework it really produces, so the attribute is the whole
+ * filter rather than a refinement of one.
+ *
+ * Returns an empty list for a file that cannot be read or carries no build
+ * action — no evidence, which the caller must not read as "builds no app".
+ */
+export function runnableAppProducts(schemeXml) {
+    if (!schemeXml)
+        return [];
+    const build = /<BuildAction\b[\s\S]*?<\/BuildAction>/.exec(schemeXml);
+    if (!build)
+        return [];
+    const products = [];
+    for (const entry of build[0].matchAll(/<BuildActionEntry\b([\s\S]*?)<\/BuildActionEntry>/g)) {
+        const attrs = entry[1];
+        if (!/buildForRunning\s*=\s*"YES"/.test(attrs))
+            continue;
+        for (const ref of attrs.matchAll(/BuildableName\s*=\s*"([^"]*)"/g)) {
+            if (ref[1].endsWith('.app'))
+                products.push(ref[1]);
+        }
+    }
+    return products;
+}
+/**
+ * The bundle to export, given everything that was built and what the scheme
+ * says it builds.
+ *
+ * In order: the scheme's own product on the destination's platform, the
+ * scheme's own product anywhere, anything on the destination's platform,
+ * anything at all. The last two are the no-shared-scheme path, and they are
+ * what keeps a project that never committed a scheme building exactly as it
+ * did before.
+ */
+export function chooseAppProduct(apps, schemeProducts, destination) {
+    if (apps.length === 0)
+        return null;
+    const suffix = platformSuffixForDestination(destination);
+    const onPlatform = apps.filter((a) => a.platform.endsWith(suffix));
+    const named = (list) => list.find((a) => schemeProducts.includes(a.name)) ?? null;
+    return named(onPlatform) ?? named(apps) ?? onPlatform[0] ?? apps[0] ?? null;
+}
+/**
+ * The resolver as it runs on the build machine: dependency-free CommonJS,
+ * written to a temp file and invoked with
+ * `node <file> <productsDir> <projectPath> <scheme> <destination>`.
+ *
+ * It prints the chosen bundle's path and nothing else, and exits non-zero with
+ * no output when it cannot choose — which is the signal for the caller's
+ * existing scan to take over, so a machine without a usable node is no worse
+ * off than before this existed.
+ *
+ * Kept as source text rather than bundled because the step ships a shell
+ * script, not a module graph. The three functions above are the same rules in
+ * testable form, and `xcode-app-product.test.ts` holds them to each other.
+ *
+ * Must contain no backtick and no dollar-brace: it is emitted into a bash
+ * heredoc, and it is a TypeScript template literal on the way there.
+ */
+export const APP_PRODUCT_RESOLVER_SOURCE = String.raw `
+var fs = require('fs');
+var path = require('path');
+
+var productsDir = process.argv[2];
+var projectPath = process.argv[3] || '';
+var scheme = process.argv[4] || '';
+var destination = process.argv[5] || '';
+
+// Every .app under Products, both directly and one platform directory down,
+// which is where -derivedDataPath leaves them.
+function builtApps(dir) {
+  var out = [];
+  var entries = readDir(dir);
+  for (var i = 0; i < entries.length; i++) {
+    var entry = entries[i];
+    if (!entry.isDirectory()) continue;
+    var full = path.join(dir, entry.name);
+    if (/\.app$/.test(entry.name)) {
+      out.push({ platform: '', name: entry.name, path: full });
+      continue;
+    }
+    var inner = readDir(full);
+    for (var j = 0; j < inner.length; j++) {
+      if (inner[j].isDirectory() && /\.app$/.test(inner[j].name)) {
+        out.push({
+          platform: entry.name,
+          name: inner[j].name,
+          path: path.join(full, inner[j].name)
+        });
+      }
+    }
+  }
+  return out;
+}
+
+function readDir(dir) {
+  try {
+    return fs.readdirSync(dir, { withFileTypes: true });
+  } catch (err) {
+    return [];
+  }
+}
+
+// Shared schemes only. A scheme under xcuserdata belongs to one developer's
+// checkout and is not in the repository, which is also what xcodebuild -list
+// would see here.
+function sharedSchemeFiles(dir, depth, found) {
+  var entries = readDir(dir);
+  for (var i = 0; i < entries.length; i++) {
+    var entry = entries[i];
+    var full = path.join(dir, entry.name);
+    if (!entry.isDirectory()) {
+      if (/\.xcscheme$/.test(entry.name)) found.push(full);
+      continue;
+    }
+    if (entry.name === 'xcuserdata' || entry.name === 'node_modules') continue;
+    if (entry.name.charAt(0) === '.') continue;
+    var container = /\.(xcodeproj|xcworkspace)$/.test(entry.name);
+    if (depth > 0 || container || entry.name === 'xcshareddata' || entry.name === 'xcschemes') {
+      sharedSchemeFiles(full, depth - 1, found);
+    }
+  }
+  return found;
+}
+
+// The products a scheme's build action RUNS. buildForRunning="NO" entries are
+// listed and not built, so a scheme naming three .app targets it merely
+// references must not be read as building any of them.
+function runnableAppProducts(schemeFile) {
+  var xml;
+  try {
+    xml = fs.readFileSync(schemeFile, 'utf-8');
+  } catch (err) {
+    return [];
+  }
+  var build = /<BuildAction\b[\s\S]*?<\/BuildAction>/.exec(xml);
+  if (!build) return [];
+  var products = [];
+  var entryRe = /<BuildActionEntry\b([\s\S]*?)<\/BuildActionEntry>/g;
+  var entry;
+  while ((entry = entryRe.exec(build[0])) !== null) {
+    if (!/buildForRunning\s*=\s*"YES"/.test(entry[1])) continue;
+    var nameRe = /BuildableName\s*=\s*"([^"]*)"/g;
+    var ref;
+    while ((ref = nameRe.exec(entry[1])) !== null) {
+      if (/\.app$/.test(ref[1])) products.push(ref[1]);
+    }
+  }
+  return products;
+}
+
+function platformSuffix(dest) {
+  var d = String(dest).toLowerCase();
+  if (d.indexOf('watchos') !== -1) return '-watchsimulator';
+  if (d.indexOf('tvos') !== -1) return '-appletvsimulator';
+  if (d.indexOf('visionos') !== -1 || d.indexOf('xros') !== -1) return '-xrsimulator';
+  return '-iphonesimulator';
+}
+
+function endsWith(text, suffix) {
+  return suffix.length <= text.length && text.slice(text.length - suffix.length) === suffix;
+}
+
+var apps = builtApps(productsDir);
+if (apps.length === 0) process.exit(1);
+
+var schemeProducts = [];
+if (scheme) {
+  var searchRoot = path.dirname(path.resolve(projectPath || '.'));
+  var files = sharedSchemeFiles(searchRoot, 3, []);
+  for (var k = 0; k < files.length; k++) {
+    if (path.basename(files[k]) !== scheme + '.xcscheme') continue;
+    var named = runnableAppProducts(files[k]);
+    for (var n = 0; n < named.length; n++) {
+      if (schemeProducts.indexOf(named[n]) === -1) schemeProducts.push(named[n]);
+    }
+  }
+}
+
+var suffix = platformSuffix(destination);
+var onPlatform = apps.filter(function (a) { return endsWith(a.platform, suffix); });
+
+function firstNamed(list) {
+  for (var i = 0; i < list.length; i++) {
+    if (schemeProducts.indexOf(list[i].name) !== -1) return list[i];
+  }
+  return null;
+}
+
+var pick = firstNamed(onPlatform) || firstNamed(apps) || onPlatform[0] || apps[0];
+if (!pick) process.exit(1);
+process.stdout.write(pick.path);
+`;
+//# sourceMappingURL=xcode-app-product.js.map

package/dist/src/yaml/steps/xcode-app-product.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=xcode-app-product.test.d.ts.map

package/dist/src/yaml/steps/xcode-app-product.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xcode-app-product.test.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/xcode-app-product.test.ts"],"names":[],"mappings":""}

package/dist/src/yaml/steps/xcode-app-product.test.js

@@ -0,0 +1,202 @@
+/**
+ * The simulator build must export the app the scheme builds.
+ *
+ * A project whose scheme builds an iOS app and a watchOS companion produces two
+ * bundles under Products, and the step took whichever a directory scan reached
+ * first. It reached the watch companion: a green build whose artifact manifest
+ * held a 588 KB watch app and not the application the scheme is named after.
+ * An empty manifest is visibly wrong; a plausible wrong answer is not, and a
+ * watch companion is common enough that this would not have stayed rare.
+ *
+ * Two halves are tested here — the rules, directly, and the resolver script
+ * that runs on the build machine, by running it against a real directory tree.
+ * The second is what the step actually ships, so the first alone would be a
+ * test of a description.
+ */
+import { execFileSync } from 'node:child_process';
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { APP_PRODUCT_RESOLVER_SOURCE, chooseAppProduct, platformSuffixForDestination, runnableAppProducts, } from './xcode-app-product.js';
+const app = (platform, name) => ({
+    platform,
+    name,
+    path: `/tmp/Products/${platform}/${name}`,
+});
+/** A scheme whose build action runs `products`, with `listed` merely referenced. */
+const schemeXml = (products, listed = []) => {
+    const entry = (name, runs) => `
+    <BuildActionEntry buildForRunning = "${runs ? 'YES' : 'NO'}" buildForArchiving = "${runs ? 'YES' : 'NO'}">
+      <BuildableReference BuildableName = "${name}"></BuildableReference>
+    </BuildActionEntry>`;
+    return `<?xml version="1.0" encoding="UTF-8"?>
+<Scheme version = "1.7">
+  <BuildAction parallelizeBuildables = "YES">
+    <BuildActionEntries>${products.map((p) => entry(p, true)).join('')}${listed
+        .map((p) => entry(p, false))
+        .join('')}
+    </BuildActionEntries>
+  </BuildAction>
+</Scheme>
+`;
+};
+describe('platformSuffixForDestination', () => {
+    test('an iOS simulator destination names the iphonesimulator products', () => {
+        expect(platformSuffixForDestination('generic/platform=iOS Simulator')).toBe('-iphonesimulator');
+    });
+    test.each([
+        ['generic/platform=watchOS Simulator', '-watchsimulator'],
+        ['generic/platform=tvOS Simulator', '-appletvsimulator'],
+        ['generic/platform=visionOS Simulator', '-xrsimulator'],
+    ])('%s builds into %s', (destination, suffix) => {
+        expect(platformSuffixForDestination(destination)).toBe(suffix);
+    });
+    // The default matters: an unrecognised or empty destination must not send the
+    // resolver looking in a directory nothing built into.
+    test('an unreadable destination falls back to iOS rather than to nothing', () => {
+        expect(platformSuffixForDestination('')).toBe('-iphonesimulator');
+    });
+});
+describe('runnableAppProducts', () => {
+    test('reads the application bundles a scheme builds', () => {
+        expect(runnableAppProducts(schemeXml(['MyApp.app']))).toEqual(['MyApp.app']);
+    });
+    // A scheme can carry several .app entries that are compatibility testers in
+    // other containers, beside the one product it really builds. "Mentions an
+    // app" would pick just as badly as a directory scan does.
+    test('ignores an entry the scheme lists but does not build', () => {
+        const xml = schemeXml(['MyApp.app'], ['APITester.app', 'ObjCAPITester.app']);
+        expect(runnableAppProducts(xml)).toEqual(['MyApp.app']);
+    });
+    test('ignores a product that is not an application bundle', () => {
+        expect(runnableAppProducts(schemeXml(['MyLib.framework', 'MyApp.app']))).toEqual(['MyApp.app']);
+    });
+    // No evidence, which the caller must not read as "builds no app".
+    test.each([
+        ['a file that could not be read', null],
+        ['a scheme with no build action', '<?xml version="1.0"?><Scheme></Scheme>'],
+    ])('%s yields nothing rather than an answer', (_label, xml) => {
+        expect(runnableAppProducts(xml)).toEqual([]);
+    });
+});
+describe('chooseAppProduct', () => {
+    const IOS = 'generic/platform=iOS Simulator';
+    // The defect, in one assertion.
+    test('takes the scheme’s own app over a companion built beside it', () => {
+        const built = [
+            app('Debug-watchsimulator', 'Companion Watch App.app'),
+            app('Debug-iphonesimulator', 'MyApp.app'),
+        ];
+        expect(chooseAppProduct(built, ['MyApp.app'], IOS)?.name).toBe('MyApp.app');
+    });
+    // And it must not depend on scan order, which is the property the old code
+    // had no opinion about at all.
+    test('takes it whichever order the products were found in', () => {
+        const built = [
+            app('Debug-iphonesimulator', 'MyApp.app'),
+            app('Debug-watchsimulator', 'Companion Watch App.app'),
+        ];
+        expect(chooseAppProduct(built, ['MyApp.app'], IOS)?.name).toBe('MyApp.app');
+    });
+    // The single-target shape, which must not regress.
+    test('takes the only app there is', () => {
+        const built = [app('Debug-iphonesimulator', 'Contributions.app')];
+        expect(chooseAppProduct(built, ['Contributions.app'], IOS)?.name).toBe('Contributions.app');
+    });
+    // Absence of evidence is not evidence: a project with no shared scheme is
+    // ordinary, and those builds worked before this resolver existed.
+    test('still resolves an app when the scheme says nothing', () => {
+        const built = [
+            app('Debug-watchsimulator', 'Watch.app'),
+            app('Debug-iphonesimulator', 'MyApp.app'),
+        ];
+        expect(chooseAppProduct(built, [], IOS)?.name).toBe('MyApp.app');
+    });
+    test('falls back to any platform when none matches the destination', () => {
+        const built = [app('Debug-maccatalyst', 'MyApp.app')];
+        expect(chooseAppProduct(built, [], IOS)?.name).toBe('MyApp.app');
+    });
+    // The scheme outranks the platform directory, not the other way round: a
+    // watchOS-only scheme built for watchOS still gets its own product.
+    test('honours the scheme when the destination is the companion’s', () => {
+        const built = [
+            app('Debug-iphonesimulator', 'MyApp.app'),
+            app('Debug-watchsimulator', 'Watch.app'),
+        ];
+        const watch = 'generic/platform=watchOS Simulator';
+        expect(chooseAppProduct(built, ['Watch.app'], watch)?.name).toBe('Watch.app');
+    });
+    test('has no answer when nothing was built', () => {
+        expect(chooseAppProduct([], ['MyApp.app'], IOS)).toBeNull();
+    });
+});
+/**
+ * The script the step actually ships, run against a real tree.
+ *
+ * The rules above are a description of what should happen; this is the thing
+ * that happens. A resolver that is correct and unshippable — a syntax error, a
+ * heredoc that swallows a character, a path assumption that only holds in the
+ * unit test — passes every assertion above and delivers the watch app.
+ */
+describe('the resolver script, as the build machine runs it', () => {
+    let root;
+    beforeEach(() => {
+        root = mkdtempSync(join(tmpdir(), 'cibuild-app-product-'));
+    });
+    afterEach(() => {
+        rmSync(root, { recursive: true, force: true });
+    });
+    const products = () => join(root, 'build', 'DerivedData', 'Build', 'Products');
+    function builtApp(platform, name) {
+        const dir = join(products(), platform, name);
+        mkdirSync(dir, { recursive: true });
+        writeFileSync(join(dir, 'Info.plist'), '<plist/>\n');
+    }
+    /** A shared scheme where Xcode puts one, inside the project bundle. */
+    function sharedScheme(project, name, xml) {
+        const dir = join(root, project, 'xcshareddata', 'xcschemes');
+        mkdirSync(dir, { recursive: true });
+        writeFileSync(join(dir, `${name}.xcscheme`), xml);
+    }
+    function resolve(scheme, destination = 'generic/platform=iOS Simulator') {
+        const script = join(root, 'resolver.cjs');
+        writeFileSync(script, APP_PRODUCT_RESOLVER_SOURCE);
+        try {
+            return execFileSync(process.execPath, [script, products(), join(root, 'MyApp.xcodeproj'), scheme, destination], { encoding: 'utf-8' });
+        }
+        catch {
+            return '';
+        }
+    }
+    test('exports the app under test, not the watch companion beside it', () => {
+        builtApp('Debug-watchsimulator', 'MyApp Watch App.app');
+        builtApp('Debug-iphonesimulator', 'MyApp.app');
+        sharedScheme('MyApp.xcodeproj', 'MyApp', schemeXml(['MyApp.app']));
+        expect(resolve('MyApp')).toBe(join(products(), 'Debug-iphonesimulator', 'MyApp.app'));
+    });
+    test('exports the only app of a single-target project', () => {
+        builtApp('Debug-iphonesimulator', 'Contributions.app');
+        sharedScheme('MyApp.xcodeproj', 'MyApp', schemeXml(['Contributions.app']));
+        expect(resolve('MyApp')).toBe(join(products(), 'Debug-iphonesimulator', 'Contributions.app'));
+    });
+    test('still resolves an app for a project with no shared scheme at all', () => {
+        builtApp('Debug-iphonesimulator', 'MyApp.app');
+        expect(resolve('MyApp')).toBe(join(products(), 'Debug-iphonesimulator', 'MyApp.app'));
+    });
+    test('reads a scheme shared by a sibling project in the same directory', () => {
+        builtApp('Debug-iphonesimulator', 'MyApp.app');
+        builtApp('Debug-watchsimulator', 'MyApp Watch App.app');
+        sharedScheme('Other.xcodeproj', 'MyApp', schemeXml(['MyApp.app']));
+        expect(resolve('MyApp')).toBe(join(products(), 'Debug-iphonesimulator', 'MyApp.app'));
+    });
+    // Nothing built is the caller's guard to report, not this script's to guess
+    // at: it must say nothing rather than print a path that does not exist.
+    test('prints nothing when the build produced no app', () => {
+        mkdirSync(products(), { recursive: true });
+        expect(resolve('MyApp')).toBe('');
+    });
+    test('prints nothing when there is no Products directory', () => {
+        expect(resolve('MyApp')).toBe('');
+    });
+});
+//# sourceMappingURL=xcode-app-product.test.js.map

package/dist/src/yaml/steps/xcode-derived-data.test.js

@@ -28,6 +28,7 @@
  */
 import { describe, test, expect } from '@jest/globals';
 import { XcodeBuildStepExecutor, XcodeBuildForTestStepExecutor, XcodeBuildForSimulatorStepExecutor, } from './xcode.js';
+import { APP_PRODUCT_RESOLVER_SOURCE } from './xcode-app-product.js';
 import { testConfig } from './test-config.js';
 const DERIVED = '-derivedDataPath "$OUTPUT_DIR/DerivedData"';
 const scriptFor = async (executor, inputs) => {
@@ -70,7 +71,8 @@ describe('xcode-build-for-simulator finds the .app where it now lands', () => {
     const build = (inputs = {}) => scriptFor(new XcodeBuildForSimulatorStepExecutor(), inputs);
     test('searches under the per-platform Products directory', async () => {
         const script = await build();
-        expect(script).toContain('find "$OUTPUT_DIR/DerivedData/Build/Products"');
+        expect(script).toContain('PRODUCTS_DIR="$OUTPUT_DIR/DerivedData/Build/Products"');
+        expect(script).toContain('find "$PRODUCTS_DIR"');
     });
     test('searches deep enough to reach <config>-<platform>/Foo.app', async () => {
         // Products/Debug-iphonesimulator/MyApp.app is two levels down. maxdepth 1
@@ -88,6 +90,69 @@ describe('xcode-build-for-simulator finds the .app where it now lands', () => {
     test('still exports the app path for later steps', async () => {
         expect(await build()).toContain('envman add --key CIBUILD_APP_DIR_PATH');
     });
+    // Following the products is not enough where a scheme builds a companion
+    // alongside the app: two bundles land and the scan cannot tell them apart.
+    // The scheme is asked first, and it is asked with the scheme and destination
+    // this step was actually given — a resolver told the wrong scheme name
+    // answers confidently and wrongly.
+    test('asks the scheme before falling back to a scan', async () => {
+        const script = await build({ scheme: 'MyApp', destination: 'generic/platform=iOS Simulator' });
+        const call = script.split('\n').find((l) => l.includes('node "$APP_RESOLVER"'));
+        expect(call).toBeDefined();
+        expect(call).toContain("'MyApp'");
+        expect(call).toContain("'generic/platform=iOS Simulator'");
+        // The scan is the fallback now, not the first answer.
+        expect(script.indexOf('node "$APP_RESOLVER"')).toBeLessThan(script.indexOf('-name "*.app"'));
+    });
+    // set -e is on, so a machine without a usable node must not fail the step
+    // before the scan it would have fallen back to has run.
+    test('a resolver that cannot run falls through instead of failing the build', async () => {
+        const call = (await build())
+            .split('\n')
+            .find((l) => l.includes('node "$APP_RESOLVER"'));
+        expect(call).toContain('|| true');
+    });
+    test('the resolver it writes is the one under test', async () => {
+        expect(await build()).toContain(APP_PRODUCT_RESOLVER_SOURCE.trim());
+    });
+});
+/**
+ * Delivery belonged to the pipeline and should have belonged to the build.
+ *
+ * gradle-build copies its own .apk into the artifacts directory. This step
+ * located the bundle, exported the path, and left it in DerivedData — which
+ * artifact discovery excludes. So an iOS proof could go green and hand the user
+ * nothing to install, and only the pipelines that added a collecting step of
+ * their own delivered anything.
+ */
+describe('xcode-build-for-simulator delivers the app it built', () => {
+    const build = (inputs = {}) => scriptFor(new XcodeBuildForSimulatorStepExecutor(), inputs);
+    test('copies its own output into the artifacts directory', async () => {
+        const script = await build();
+        expect(script).toContain('ARTIFACTS_DIR="${CIBUILD_ARTIFACTS_DIR:-.ci/artifacts}"');
+        expect(script).toContain('mkdir -p "$ARTIFACTS_DIR"');
+    });
+    // A .app is a directory. Staged as one it becomes an artifact per file
+    // inside it, and an internal symlink pointing outside the workspace fails
+    // the stage. A .zip is a plain file and stages as exactly one artifact.
+    test('delivers one zip rather than the bundle directory', async () => {
+        const script = await build();
+        expect(script).toContain('ditto -c -k --keepParent "$APP_PATH" "$ARTIFACTS_DIR/$APP_NAME.zip"');
+    });
+    // The app it exported and the app it delivers are the same one, or the
+    // manifest disagrees with CIBUILD_APP_DIR_PATH and the wrong bundle ships
+    // under a right-looking name.
+    test('delivers the bundle it exported, not another scan of the tree', async () => {
+        const script = await build();
+        expect(script).toContain('APP_NAME="$(basename "$APP_PATH")"');
+        expect(script.indexOf('envman add --key CIBUILD_APP_DIR_PATH')).toBeLessThan(script.indexOf('ditto -c -k'));
+    });
+    // A pipeline that already collects the app runs after this and writes the
+    // same path; re-running the build must not leave two zips either.
+    test('replaces its own previous zip rather than appending to it', async () => {
+        const script = await build();
+        expect(script.indexOf('rm -f "$ARTIFACTS_DIR/$APP_NAME.zip"')).toBeLessThan(script.indexOf('ditto -c -k'));
+    });
 });
 describe('the output_dir input still steers where everything goes', () => {
     // The template gives "Build App" its own output_dir, so derived data has to

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

@@ -1 +1 @@
-{"version":3,"file":"xcode.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/xcode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xcode.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/xcode.ts"],"names":[],"mappings":"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"}

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

@@ -4,6 +4,7 @@
 import { existsSync } from 'node:fs';
 import { BaseStepExecutor } from './base.js';
 import { resolveDestinationInput } from './xcode-destination.js';
+import { APP_PRODUCT_RESOLVER_SOURCE } from './xcode-app-product.js';
 import { refusedFetchHelpers, retryOnRefusedFetch } from './git-fetch-retry.js';
 /**
  * Xcodebuild step executor
@@ -1097,10 +1098,27 @@ export class XcodeBuildForSimulatorStepExecutor extends BaseStepExecutor {
         // rather than flat in $OUTPUT_DIR, so the guard has to follow it — at
         // maxdepth 1 this found nothing and the step would fail every build with
         // ".app not found" while the app had compiled perfectly.
-        commands.push('# Locate generated .app');
-        commands.push('APP_PATH=$(find "$OUTPUT_DIR/DerivedData/Build/Products" -maxdepth 2 -name "*.app" -type d 2>/dev/null | head -1)');
+        //
+        // Following the products is not enough on its own, though, because a scheme
+        // that builds a watchOS or tvOS companion produces more than one bundle and
+        // a scan has no way to tell them apart. Ask the scheme, which knows: see
+        // xcode-app-product.ts. The scan below is what runs when the scheme cannot
+        // answer — a project with no shared scheme is ordinary and builds fine, so
+        // this resolves the same bundle it always did there.
+        commands.push('# Locate generated .app — the one this scheme builds');
+        commands.push('PRODUCTS_DIR="$OUTPUT_DIR/DerivedData/Build/Products"');
+        commands.push('APP_RESOLVER="$(mktemp -t cibuild-app-product).cjs"');
+        commands.push(`cat > "$APP_RESOLVER" << 'CIBUILD_APP_PRODUCT_EOF'`);
+        commands.push(APP_PRODUCT_RESOLVER_SOURCE.trim());
+        commands.push('CIBUILD_APP_PRODUCT_EOF');
+        commands.push('APP_PATH=$(node "$APP_RESOLVER" "$PRODUCTS_DIR"' +
+            ` '${escapedPath}' '${escapedScheme}' '${this.escapeBash(destination)}' 2>/dev/null || true)`);
+        commands.push('rm -f "$APP_RESOLVER"');
+        commands.push('if [ -z "$APP_PATH" ]; then');
+        commands.push('  APP_PATH=$(find "$PRODUCTS_DIR" -maxdepth 2 -name "*.app" -type d 2>/dev/null | head -1)');
+        commands.push('fi');
         commands.push('if [ -z "$APP_PATH" ]; then');
-        commands.push('  echo "❌ Error: .app not found under $OUTPUT_DIR/DerivedData/Build/Products"');
+        commands.push('  echo "❌ Error: .app not found under $PRODUCTS_DIR"');
         commands.push('  exit 1');
         commands.push('fi');
         commands.push('');
@@ -1109,6 +1127,35 @@ export class XcodeBuildForSimulatorStepExecutor extends BaseStepExecutor {
         commands.push('');
         // Export
         commands.push('envman add --key CIBUILD_APP_DIR_PATH --value "$APP_PATH"');
+        commands.push('');
+        // Deliver it, the way gradle-build delivers its .apk.
+        //
+        // gradle-build copies its own output into the artifacts directory; this
+        // step located the bundle, exported the path and left it in DerivedData —
+        // which the runner excludes from artifact discovery. So the app was
+        // findable and deliberately not found, and an iOS proof could go green
+        // handing the user nothing to install. Pipelines that added a collecting
+        // step of their own delivered; every other one did not, which made
+        // delivery a property of the pipeline rather than of the build.
+        //
+        // It zips rather than copying the bundle in, and that is not cosmetic. A
+        // .app is a directory: staged as a directory it becomes one artifact per
+        // file inside it — every asset, nib and framework separately — and an
+        // internal symlink pointing outside the workspace fails the stage
+        // outright. A .zip is a plain file, stages as exactly one artifact, and is
+        // what someone downloading it wants anyway. ditto is the macOS-native
+        // archiver and preserves the bundle's permissions and symlinks, which a
+        // plain recursive zip does not do faithfully.
+        commands.push('# Deliver the app as one artifact');
+        commands.push('ARTIFACTS_DIR="${CIBUILD_ARTIFACTS_DIR:-.ci/artifacts}"');
+        commands.push('mkdir -p "$ARTIFACTS_DIR"');
+        commands.push('APP_NAME="$(basename "$APP_PATH")"');
+        commands.push('rm -f "$ARTIFACTS_DIR/$APP_NAME.zip"');
+        commands.push('ditto -c -k --keepParent "$APP_PATH" "$ARTIFACTS_DIR/$APP_NAME.zip"');
+        commands.push('echo "  → Collected: $APP_NAME.zip"');
+        commands.push('echo "✅ Artifacts copied to: $ARTIFACTS_DIR"');
+        commands.push('ls -lh "$ARTIFACTS_DIR"');
+        commands.push('');
         commands.push('rm -f "$XCCONFIG_FILE"');
         const script = this.createBashScriptFromCommands(commands, stepName);
         return this.createScriptStep(script, stepName);

package/package.json

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