@invarn/cibuild 2.7.1 → 2.7.2

package/dist/src/yaml/steps/git-fetch-retry.js

@@ -0,0 +1,155 @@
+/**
+ * Retrying a refused third-party dependency fetch, and naming the reason when
+ * the retry does not save it.
+ *
+ * A build that resolves its dependencies from public git repositories fetches
+ * them anonymously. When a host answers one of those fetches with HTTP 401,
+ * git has no credential to fall back on and prints
+ *
+ *     fatal: could not read Username for 'https://<host>': terminal prompts disabled
+ *     fatal: expected flush after ref listing
+ *
+ * Those two lines are one failure, not two: the transport child asks for a
+ * username, cannot prompt, and dies; the parent then finds the ref listing
+ * truncated. git asks for a username *only* on a 401, which makes the first
+ * line an exact signature for "the server refused this fetch".
+ *
+ * Such a refusal has been observed to be transient — the same repository
+ * readable again a minute or two later, from the same machine and the same
+ * address — while landing in the middle of a dependency resolution and taking
+ * a multi-minute build down with it.
+ *
+ * Two things are emitted here, and they are deliberately separate:
+ *
+ *   - a retry around the fetch, gated on that signature, so a compile error
+ *     still fails on the first attempt instead of three attempts later; and
+ *   - a diagnostic that re-probes every refused URL and prints the HTTP status
+ *     it gets back. Nothing else in the pipeline records that status, so a
+ *     build failing this way otherwise reports a missing package rather than a
+ *     refused fetch, and a recurrence is unattributable after the fact. The
+ *     probe is the whole reason the second occurrence will be cheaper to
+ *     explain than the first.
+ *
+ * The emitted shell is bash and runs under `set -e` / `set -o pipefail`, which
+ * is why the exit code is measured explicitly rather than inferred.
+ */
+/**
+ * The line git prints when, and only when, a server answers a fetch with
+ * HTTP 401 and no credential is available.
+ */
+export const REFUSED_FETCH_SIGNATURE = 'could not read Username for';
+/**
+ * Shell functions and state the retry depends on. Emit once per script, before
+ * the first `retryOnRefusedFetch` block.
+ */
+export function refusedFetchHelpers() {
+    return [
+        '# --- refused dependency fetch: retry, then explain -------------------------',
+        'CIBUILD_FETCH_LOG="$(mktemp -t cibuild-fetch)"',
+        '',
+        '# git asks for a username only when a server answers with HTTP 401, so this',
+        '# line means the fetch was refused, not that a package is missing.',
+        'cibuild_fetch_was_refused() {',
+        `  grep -q '${REFUSED_FETCH_SIGNATURE}' "$CIBUILD_FETCH_LOG" 2>/dev/null`,
+        '}',
+        '',
+        '# The status that caused the refusal is recorded nowhere, so ask again and',
+        '# put it in the build log where the next person will find it.',
+        'cibuild_diagnose_refused_fetch() {',
+        '  echo ""',
+        '  echo "──────────────────────────────────────────────────────────────"',
+        '  echo "A dependency fetch was refused."',
+        '  echo ""',
+        '  echo "git asked for a username, which it does only when the server answered"',
+        '  echo "with HTTP 401. That is an authentication refusal, not a missing"',
+        '  echo "package. Re-probing each repository named above:"',
+        '  echo ""',
+        // Every stage here can legitimately match nothing, and under `set -e` with
+        // `pipefail` an empty grep would abort the step and replace the command's
+        // real exit code with 1. The diagnostic must never do that: it runs on the
+        // failure path, and its whole job is to explain a failure it did not cause.
+        `  grep -oE 'https://[^ "'"'"']+' "$CIBUILD_FETCH_LOG" 2>/dev/null \\`,
+        `    | sed -e "s/[.,:;')]*$//" -e 's/\\.git$//' \\`,
+        `    | grep -E '^https://[^/]+/[^/]+/[^/]+$' \\`,
+        '    | sort -u | head -20 \\',
+        '    | while IFS= read -r CIBUILD_FETCH_PROBE_URL; do',
+        '        CIBUILD_FETCH_PROBE_CODE="$(curl -sS -o /dev/null -m 20 \\',
+        `          -w '%{http_code}' \\`,
+        '          "$CIBUILD_FETCH_PROBE_URL/info/refs?service=git-upload-pack" 2>/dev/null)" \\',
+        '          || CIBUILD_FETCH_PROBE_CODE="000"',
+        '        case "$CIBUILD_FETCH_PROBE_CODE" in',
+        '          200)',
+        '            echo "  200  $CIBUILD_FETCH_PROBE_URL"',
+        '            echo "       readable anonymously now — the refusal was transient"',
+        '            ;;',
+        '          401|403)',
+        '            echo "  $CIBUILD_FETCH_PROBE_CODE  $CIBUILD_FETCH_PROBE_URL"',
+        '            echo "       still refused — this repository needs a credential, or the"',
+        '            echo "       host is refusing anonymous reads from this machine"',
+        '            ;;',
+        '          404)',
+        '            echo "  404  $CIBUILD_FETCH_PROBE_URL"',
+        '            echo "       no such repository — check the dependency URL"',
+        '            ;;',
+        '          000)',
+        '            echo "  ---  $CIBUILD_FETCH_PROBE_URL"',
+        '            echo "       unreachable from this machine — network, DNS or TLS"',
+        '            ;;',
+        '          *)',
+        '            echo "  $CIBUILD_FETCH_PROBE_CODE  $CIBUILD_FETCH_PROBE_URL"',
+        '            ;;',
+        '        esac',
+        '      done || true',
+        '  echo ""',
+        '  echo "A 200 above means the fetch would succeed if it ran again now."',
+        '  echo "──────────────────────────────────────────────────────────────"',
+        '  echo ""',
+        '}',
+        '',
+    ];
+}
+/**
+ * Runs `command`, retrying it while the failure looks like a refused fetch.
+ * On the last failure the diagnostic runs and the step exits with the
+ * command's own status, so the reported exit code is still the real one.
+ */
+export function retryOnRefusedFetch(options) {
+    const attempts = options.attempts ?? 3;
+    const backoff = options.backoffSeconds ?? [15, 45];
+    const label = options.label.replace(/"/g, '\\"');
+    return [
+        `CIBUILD_FETCH_MAX_ATTEMPTS=${attempts}`,
+        `CIBUILD_FETCH_BACKOFF=(${backoff.join(' ')})`,
+        'CIBUILD_FETCH_ATTEMPT=1',
+        'while :; do',
+        '  set +e',
+        `  ${options.command} 2>&1 | tee "$CIBUILD_FETCH_LOG"`,
+        '  CIBUILD_FETCH_RC=${PIPESTATUS[0]}',
+        '  set -e',
+        '  if [ "$CIBUILD_FETCH_RC" -eq 0 ]; then',
+        '    break',
+        '  fi',
+        // Anything that is not a refused fetch is a real failure: fail now.
+        '  if ! cibuild_fetch_was_refused; then',
+        '    break',
+        '  fi',
+        '  if [ "$CIBUILD_FETCH_ATTEMPT" -ge "$CIBUILD_FETCH_MAX_ATTEMPTS" ]; then',
+        '    break',
+        '  fi',
+        '  CIBUILD_FETCH_WAIT="${CIBUILD_FETCH_BACKOFF[$((CIBUILD_FETCH_ATTEMPT - 1))]:-30}"',
+        `  echo "⚠️  ${label} was refused by the server (attempt $CIBUILD_FETCH_ATTEMPT of $CIBUILD_FETCH_MAX_ATTEMPTS)."`,
+        '  echo "   A refused anonymous fetch is usually transient. Retrying in ${CIBUILD_FETCH_WAIT}s..."',
+        '  sleep "$CIBUILD_FETCH_WAIT"',
+        '  CIBUILD_FETCH_ATTEMPT=$((CIBUILD_FETCH_ATTEMPT + 1))',
+        'done',
+        '',
+        'if [ "$CIBUILD_FETCH_RC" -ne 0 ]; then',
+        '  if cibuild_fetch_was_refused; then',
+        '    cibuild_diagnose_refused_fetch',
+        '  fi',
+        '  exit "$CIBUILD_FETCH_RC"',
+        'fi',
+        '',
+    ];
+}
+//# sourceMappingURL=git-fetch-retry.js.map

package/dist/src/yaml/steps/git-fetch-retry.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Tests for retrying a refused third-party dependency fetch.
+ */
+export {};
+//# sourceMappingURL=git-fetch-retry.test.d.ts.map

package/dist/src/yaml/steps/git-fetch-retry.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-fetch-retry.test.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/git-fetch-retry.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/src/yaml/steps/git-fetch-retry.test.js

@@ -0,0 +1,86 @@
+/**
+ * Tests for retrying a refused third-party dependency fetch.
+ */
+import { describe, test, expect } from '@jest/globals';
+import { REFUSED_FETCH_SIGNATURE, refusedFetchHelpers, retryOnRefusedFetch, } from './git-fetch-retry.js';
+const helpers = () => refusedFetchHelpers().join('\n');
+const retry = (o) => retryOnRefusedFetch(o).join('\n');
+describe('refusedFetchHelpers', () => {
+    test('keys off the line git prints only for an HTTP 401', () => {
+        expect(REFUSED_FETCH_SIGNATURE).toBe('could not read Username for');
+        expect(helpers()).toContain(REFUSED_FETCH_SIGNATURE);
+    });
+    test('captures output to a log the diagnostic can re-read', () => {
+        const script = helpers();
+        expect(script).toContain('CIBUILD_FETCH_LOG=');
+        expect(script).toContain('mktemp');
+    });
+    test('re-probes each refused URL for its HTTP status', () => {
+        const script = helpers();
+        // The whole point: the 401 is recorded nowhere, so ask again and print it.
+        expect(script).toContain('info/refs?service=git-upload-pack');
+        expect(script).toContain("-w '%{http_code}'");
+        expect(script).toContain('cibuild_diagnose_refused_fetch()');
+    });
+    test('explains each status it can get back', () => {
+        const script = helpers();
+        expect(script).toContain('200)');
+        expect(script).toContain('401|403)');
+        expect(script).toContain('404)');
+        // An unreachable host must not be reported as a refusal.
+        expect(script).toContain('000)');
+        expect(script).toContain('unreachable from this machine');
+    });
+    test('never lets a probe failure abort the step', () => {
+        // The diagnostic runs on the failure path; it must not mask the real error.
+        expect(helpers()).toContain('|| CIBUILD_FETCH_PROBE_CODE="000"');
+    });
+});
+describe('retryOnRefusedFetch', () => {
+    const opts = { label: 'Package resolution', command: 'xcodebuild -resolvePackageDependencies' };
+    test('runs the command it was given', () => {
+        expect(retry(opts)).toContain('xcodebuild -resolvePackageDependencies');
+    });
+    test('streams output live while still capturing it', () => {
+        const script = retry(opts);
+        expect(script).toContain('| tee "$CIBUILD_FETCH_LOG"');
+        // tee would otherwise mask the command's own exit code.
+        expect(script).toContain('${PIPESTATUS[0]}');
+    });
+    test('retries only when the failure is a refused fetch', () => {
+        const script = retry(opts);
+        // A compile error must fail on the first attempt, not after three.
+        expect(script).toContain('if ! cibuild_fetch_was_refused; then');
+        expect(script).toContain('break');
+    });
+    test('backs off between attempts', () => {
+        const script = retry({ ...opts, attempts: 3, backoffSeconds: [15, 45] });
+        expect(script).toContain('CIBUILD_FETCH_BACKOFF=(15 45)');
+        expect(script).toContain('sleep');
+    });
+    test('defaults to three attempts', () => {
+        expect(retry(opts)).toContain('CIBUILD_FETCH_MAX_ATTEMPTS=3');
+    });
+    test('honours a custom attempt count', () => {
+        expect(retry({ ...opts, attempts: 5 })).toContain('CIBUILD_FETCH_MAX_ATTEMPTS=5');
+    });
+    test('diagnoses and then fails with the original exit code', () => {
+        const script = retry(opts);
+        expect(script).toContain('cibuild_diagnose_refused_fetch');
+        expect(script).toContain('exit "$CIBUILD_FETCH_RC"');
+    });
+    test('names the thing being fetched in its retry message', () => {
+        expect(retry(opts)).toContain('Package resolution');
+    });
+    test('does not use a bare && before break, which set -e would trip on', () => {
+        // `[ x ] && break` returns 1 when the test is false and aborts under set -e.
+        expect(retry(opts)).not.toMatch(/\]\s*&&\s*break/);
+    });
+    test('restores set -e after measuring the exit code', () => {
+        const script = retry(opts);
+        expect(script).toContain('set +e');
+        expect(script).toContain('set -e');
+        expect(script.indexOf('set +e')).toBeLessThan(script.lastIndexOf('set -e'));
+    });
+});
+//# sourceMappingURL=git-fetch-retry.test.js.map

package/dist/src/yaml/steps/ios-deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios-deps.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ios-deps.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAc,MAAM,wBAAwB,CAAC;AAMhF,MAAM,WAAW,sBAAsB;IACrC,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,qBAAa,4BAA6B,SAAQ,gBAAgB;IAChE,yBAAyB,CACvB,OAAO,EAAE,sBAAsB,EAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAuEpB;AAMD,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;IACxD,yBAAyB,CACvB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAyDpB"}
+{"version":3,"file":"ios-deps.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ios-deps.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAc,MAAM,wBAAwB,CAAC;AAMhF,MAAM,WAAW,sBAAsB;IACrC,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,qBAAa,4BAA6B,SAAQ,gBAAgB;IAChE,yBAAyB,CACvB,OAAO,EAAE,sBAAsB,EAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAkFpB;AAMD,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;IACxD,yBAAyB,CACvB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAyDpB"}

package/dist/src/yaml/steps/ios-deps.js

@@ -2,6 +2,7 @@
  * iOS dependency management steps: cocoapods-install, carthage
  */
 import { BaseStepExecutor } from './base.js';
+import { refusedFetchHelpers, retryOnRefusedFetch } from './git-fetch-retry.js';
 /**
  * Runs `pod install` or `pod update`.
  * Auto-detects Gemfile and uses `bundle exec pod` when appropriate.
@@ -66,13 +67,22 @@ export class CocoapodsInstallStepExecutor extends BaseStepExecutor {
         const verboseFlag = verbose ? ' --verbose' : '';
         commands.push(`POD_CMD="${this.escapeBash(command)}${verboseFlag}"`);
         commands.push('');
+        // One invocation, chosen up front, so the retry wraps it once rather than
+        // once per branch. `pod install` clones each pod's source over https, and a
+        // refused anonymous clone there fails the step exactly as it does during a
+        // Swift package resolve — same signature, same fix.
         commands.push('if [ "$USE_BUNDLE_EXEC" = "true" ]; then');
-        commands.push('  echo "Running: bundle exec pod $POD_CMD"');
-        commands.push('  bundle exec pod $POD_CMD');
+        commands.push('  POD_INVOCATION="bundle exec pod"');
         commands.push('else');
-        commands.push('  echo "Running: pod $POD_CMD"');
-        commands.push('  pod $POD_CMD');
+        commands.push('  POD_INVOCATION="pod"');
         commands.push('fi');
+        commands.push('echo "Running: $POD_INVOCATION $POD_CMD"');
+        commands.push('');
+        commands.push(...refusedFetchHelpers());
+        commands.push(...retryOnRefusedFetch({
+            label: 'CocoaPods dependency fetch',
+            command: '$POD_INVOCATION $POD_CMD',
+        }));
         commands.push('');
         commands.push('echo "✅ CocoaPods ${POD_CMD%% *} completed"');
         const script = this.createBashScriptFromCommands(commands, stepName);

package/dist/src/yaml/steps/xcode-resolve-retry.test.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Dependency resolution is separated from the build and retried.
+ *
+ * Resolution takes seconds and the build that follows takes minutes, so a
+ * refused fetch should cost a retry of the cheap half, not a re-run of the
+ * expensive one. These assert the split actually lands in the emitted script.
+ */
+export {};
+//# sourceMappingURL=xcode-resolve-retry.test.d.ts.map

package/dist/src/yaml/steps/xcode-resolve-retry.test.d.ts.map

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

package/dist/src/yaml/steps/xcode-resolve-retry.test.js

@@ -0,0 +1,111 @@
+/**
+ * Dependency resolution is separated from the build and retried.
+ *
+ * Resolution takes seconds and the build that follows takes minutes, so a
+ * refused fetch should cost a retry of the cheap half, not a re-run of the
+ * expensive one. These assert the split actually lands in the emitted script.
+ */
+import { describe, test, expect } from '@jest/globals';
+import { XcodeBuildStepExecutor, XcodeBuildForTestStepExecutor } from './xcode.js';
+import { CocoapodsInstallStepExecutor } from './ios-deps.js';
+import { testConfig } from './test-config.js';
+const countOccurrences = (haystack, needle) => haystack.split(needle).length - 1;
+describe('xcode-build-for-test resolves before it builds', () => {
+    const build = async (inputs = {}) => {
+        const executor = new XcodeBuildForTestStepExecutor();
+        const result = await executor.execute({ project_path: 'MyApp.xcworkspace', scheme: 'MyApp', ...inputs }, {}, testConfig);
+        return result.script;
+    };
+    test('resolves package dependencies as its own command', async () => {
+        expect(await build()).toContain('xcodebuild -resolvePackageDependencies');
+    });
+    test('resolves BEFORE build-for-testing', async () => {
+        const script = await build();
+        expect(script.indexOf('xcodebuild -resolvePackageDependencies')).toBeLessThan(script.indexOf('xcodebuild build-for-testing'));
+    });
+    test('resolves into the same derived data the build will read', async () => {
+        // Otherwise the resolve is wasted work and the build fetches all over again.
+        const script = await build();
+        const resolveLine = script
+            .split('\n')
+            .find((l) => l.includes('-resolvePackageDependencies'));
+        expect(resolveLine).toContain('-derivedDataPath "$OUTPUT_DIR/DerivedData"');
+    });
+    test('passes the same project type and scheme as the build', async () => {
+        const resolveLine = (await build())
+            .split('\n')
+            .find((l) => l.includes('-resolvePackageDependencies'));
+        expect(resolveLine).toContain('"$PROJECT_TYPE"');
+        expect(resolveLine).toContain("'MyApp.xcworkspace'");
+        expect(resolveLine).toContain("-scheme 'MyApp'");
+    });
+    test('wraps the resolve in the refused-fetch retry', async () => {
+        const script = await build();
+        expect(script).toContain('cibuild_fetch_was_refused');
+        expect(script).toContain('CIBUILD_FETCH_MAX_ATTEMPTS');
+    });
+    test('defines the retry helpers exactly once', async () => {
+        const script = await build();
+        expect(countOccurrences(script, 'cibuild_diagnose_refused_fetch()')).toBe(1);
+        expect(countOccurrences(script, 'cibuild_fetch_was_refused()')).toBe(1);
+    });
+    test('does not retry the expensive build step itself', async () => {
+        const script = await build();
+        // exactly one retry loop, and it is the resolve
+        expect(countOccurrences(script, 'CIBUILD_FETCH_MAX_ATTEMPTS=')).toBe(1);
+        const loopStart = script.indexOf('CIBUILD_FETCH_MAX_ATTEMPTS=');
+        expect(loopStart).toBeLessThan(script.indexOf('xcodebuild build-for-testing'));
+    });
+    test('still builds and still exports its outputs', async () => {
+        const script = await build();
+        expect(script).toContain('xcodebuild build-for-testing');
+        expect(script).toContain('envman add --key CIBUILD_XCTESTRUN_FILE_PATH');
+    });
+});
+describe('xcodebuild resolves before it builds', () => {
+    const build = async (inputs = {}) => {
+        const executor = new XcodeBuildStepExecutor();
+        const result = await executor.execute({ project_path: 'MyApp.xcodeproj', scheme: 'MyApp', ...inputs }, {}, testConfig);
+        return result.script;
+    };
+    test('resolves package dependencies before building', async () => {
+        const script = await build();
+        expect(script).toContain('xcodebuild -resolvePackageDependencies');
+        expect(script.indexOf('xcodebuild -resolvePackageDependencies')).toBeLessThan(script.indexOf('xcodebuild build '));
+    });
+    test('wraps the resolve in the refused-fetch retry', async () => {
+        expect(await build()).toContain('cibuild_fetch_was_refused');
+    });
+    test('leaves the build invocation itself unwrapped', async () => {
+        expect(countOccurrences(await build(), 'CIBUILD_FETCH_MAX_ATTEMPTS=')).toBe(1);
+    });
+    test('still honours a clean build', async () => {
+        expect(await build({ is_clean_build: true })).toContain('xcodebuild clean build');
+    });
+});
+describe('cocoapods-install retries a refused pod source fetch', () => {
+    const build = async (inputs = {}) => {
+        const executor = new CocoapodsInstallStepExecutor();
+        const result = await executor.execute(inputs, {}, testConfig);
+        return result.script;
+    };
+    test('wraps the pod command in the retry', async () => {
+        const script = await build();
+        expect(script).toContain('cibuild_fetch_was_refused');
+        expect(script).toContain('CIBUILD_FETCH_MAX_ATTEMPTS');
+    });
+    test('still chooses between bundle exec and bare pod', async () => {
+        const script = await build();
+        expect(script).toContain('bundle exec pod');
+        expect(script).toContain('USE_BUNDLE_EXEC');
+    });
+    test('runs the pod command exactly once in the script', async () => {
+        // The old shape invoked pod in both branches of an if/else; the retry
+        // needs a single invocation or it would be wrapped twice.
+        expect(countOccurrences(await build(), 'CIBUILD_FETCH_MAX_ATTEMPTS=')).toBe(1);
+    });
+    test('still reports completion', async () => {
+        expect(await build()).toContain('CocoaPods');
+    });
+});
+//# sourceMappingURL=xcode-resolve-retry.test.js.map

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 { refusedFetchHelpers, retryOnRefusedFetch } from './git-fetch-retry.js';
 /**
  * Xcodebuild step executor
  * Builds iOS/macOS projects using xcodebuild
@@ -78,6 +79,20 @@ export class XcodeBuildStepExecutor extends BaseStepExecutor {
         commands.push('else');
         commands.push('  PROJECT_TYPE="-project"');
         commands.push('fi');
+        // Resolve the package graph before building, and retry that on a refused
+        // fetch. Resolution is seconds and the build is minutes, so the retry is
+        // spent on the cheap half. No -derivedDataPath here: this step does not
+        // set one for the build either, so both use the default location and the
+        // build finds the graph this just resolved.
+        commands.push('');
+        commands.push('# Resolve package dependencies first — see git-fetch-retry');
+        commands.push(...refusedFetchHelpers());
+        commands.push(...retryOnRefusedFetch({
+            label: 'Package resolution',
+            command: 'xcodebuild -resolvePackageDependencies' +
+                ` "$PROJECT_TYPE" '${escapedPath}'` +
+                ` -scheme '${this.escapeBash(scheme)}'`,
+        }));
         // Build xcodebuild command
         commands.push('');
         commands.push('# Build xcodebuild command');
@@ -792,6 +807,19 @@ export class XcodeBuildForTestStepExecutor extends BaseStepExecutor {
         commands.push('  PROJECT_TYPE="-project"');
         commands.push('fi');
         commands.push('');
+        // Resolve the package graph on its own, ahead of the build, so a refused
+        // fetch costs a retry of something that takes seconds rather than a re-run
+        // of build-for-testing, which takes minutes. The build that follows reads
+        // the same derived data and finds the graph already resolved.
+        commands.push('# Resolve package dependencies first — see git-fetch-retry');
+        commands.push(...refusedFetchHelpers());
+        commands.push(...retryOnRefusedFetch({
+            label: 'Package resolution',
+            command: 'xcodebuild -resolvePackageDependencies' +
+                ` "$PROJECT_TYPE" '${escapedPath}'` +
+                ` -scheme '${escapedScheme}'` +
+                ' -derivedDataPath "$OUTPUT_DIR/DerivedData"',
+        }));
         // Build command
         let cmd = 'xcodebuild build-for-testing';
         cmd += ` "$PROJECT_TYPE" '${escapedPath}'`;

package/package.json

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