v18.4.0

[worker] Prevent forwarding HTTP log failures to GCS logstream (#3507 )
Makes sure we don't log "Failed to upload batch of logs" to user-facing log as we did [here](https://staging.expo.dev/accounts/expo-services/projects/worker-system-tests/workflows/019cf7b3-19d6-7b57-bb6f-41d5c63491e3).
2026-11-13 20:28:08 -10:00 · 2026-03-16 20:21:54 +00:00 · 2026-03-16 19:02:25 +01:00 · 2026-03-16 18:23:50 +01:00 · 2026-03-16 16:41:07 +01:00 · 2026-03-16 15:11:46 +01:00
49 changed files with 1370 additions and 504 deletions
@@ -1,6 +1,7 @@
 name: CHANGELOG.md PR check

 on:
+  workflow_dispatch:
  pull_request:
    types:
      - opened
@@ -29,7 +30,7 @@ jobs:
        with:
          script: |
            core.setFailed('Please add a changelog entry!')
-      - uses: mshick/add-pr-comment@v2.1.0
+      - uses: mshick/add-pr-comment@v2.8.2
        if: always()
        with:
          message-id: changelog-entry-check
@@ -8,6 +8,9 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

+- Auto-detect non-interactive mode in CI and non-TTY environments. ([#3486](https://github.com/expo/eas-cli/pull/3486) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `skip-build-if-not-found` flag to `eas build:dev`. ([#3495](https://github.com/expo/eas-cli/pull/3495) by [@mmichels-brex](https://github.com/mmichels-brex))
+
 ### 🐛 Bug fixes

 ### 🧹 Chores
@@ -28,6 +31,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 Bug fixes

+- Check all certificates in provisioning profile during verification instead of only the first one. ([#3484](https://github.com/expo/eas-cli/pull/3484) by [@qwertey6](https://github.com/qwertey6))
 - Provide an override for the new --environment flag requirement in the update command. ([#3442](https://github.com/expo/eas-cli/pull/3442) by [@douglowder](https://github.com/douglowder))
 - Add missing `--include=dev` for `npm install` commands ([#3459](https://github.com/expo/eas-cli/pull/3459) by [@kitten](https://github.com/kitten))
 - Add missing `--production false` for `yarn install` commands for Yarn Classic ([#3459](https://github.com/expo/eas-cli/pull/3459) by [@kitten](https://github.com/kitten))
@@ -1672,7 +1676,6 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add rollback disambiguation command. ([#2004](https://github.com/expo/eas-cli/pull/2004) by [@wschurman](https://github.com/wschurman))
 - Detect devices that fail to be provisioned, list them to the user and show the explanation message with the link to the devices page to check actual status. ([#2011](https://github.com/expo/eas-cli/pull/2011) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
 - Add info to EAS Update asset upload process about asset counts and limits. ([#2013](https://github.com/expo/eas-cli/pull/2013) by [@wschurman](https://github.com/wschurman))
- .nvmrc support for setting node version. ([#1954](https://github.com/expo/eas-cli/pull/1954) by [@khamilowicz](https://github.com/khamilowicz))

 ### 🐛 Bug fixes

@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
-  "version": "18.3.0",
+  "version": "18.4.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -1,6 +1,6 @@
 {
  "name": "@expo/build-tools",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "BUSL-1.1",
  "author": "Expo <[email protected]>",
@@ -38,14 +38,14 @@
    "@expo/config": "10.0.6",
    "@expo/config-plugins": "9.0.12",
    "@expo/downloader": "18.0.1",
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/eas-build-job": "18.4.0",
    "@expo/env": "^0.4.0",
    "@expo/logger": "18.0.1",
    "@expo/package-manager": "1.9.10",
    "@expo/plist": "^0.2.0",
    "@expo/results": "^1.0.0",
    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "18.2.0",
+    "@expo/steps": "18.4.0",
    "@expo/template-file": "18.0.1",
    "@expo/turtle-spawn": "18.0.1",
    "@expo/xcpretty": "^4.3.1",
@@ -42,7 +42,7 @@ export async function runGradleCommand(
        return line;
      }
    },
-    env: { ...ctx.env, ...extraEnv, ...resolveVersionOverridesEnvs(ctx) },
+    env: { ...ctx.env, ...extraEnv, ...resolveVersionOverridesEnvs(ctx), LC_ALL: 'C.UTF-8' },
  });
  if (ctx.env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux') {
    adjustOOMScore(spawnPromise, logger);
@@ -1,57 +0,0 @@
-import { AndroidConfig } from '@expo/config-plugins';
-import { Android } from '@expo/eas-build-job';
-import fs from 'fs-extra';
-import path from 'path';
-
-import { BuildContext } from '../context';
-import { EasBuildGradle } from '../templates/EasBuildGradle';
-const APPLY_EAS_BUILD_GRADLE_LINE = 'apply from: "./eas-build.gradle"';
-
-export async function configureBuildGradle(ctx: BuildContext<Android.Job>): Promise<void> {
-  ctx.logger.info('Injecting signing config into build.gradle');
-  if (await fs.pathExists(getEasBuildGradlePath(ctx.getReactNativeProjectDirectory()))) {
-    ctx.markBuildPhaseHasWarnings();
-    ctx.logger.warn('eas-build.gradle script is deprecated, please remove it from your project.');
-  }
-  await deleteEasBuildGradle(ctx.getReactNativeProjectDirectory());
-  await createEasBuildGradle(ctx.getReactNativeProjectDirectory());
-  await addApplyToBuildGradle(ctx.getReactNativeProjectDirectory());
-}
-
-async function deleteEasBuildGradle(projectRoot: string): Promise<void> {
-  const easBuildGradlePath = getEasBuildGradlePath(projectRoot);
-  await fs.remove(easBuildGradlePath);
-}
-
-function getEasBuildGradlePath(projectRoot: string): string {
-  return path.join(projectRoot, 'android/app/eas-build.gradle');
-}
-
-async function createEasBuildGradle(projectRoot: string): Promise<void> {
-  const easBuildGradlePath = getEasBuildGradlePath(projectRoot);
-  await fs.writeFile(easBuildGradlePath, EasBuildGradle);
-}
-
-async function addApplyToBuildGradle(projectRoot: string): Promise<void> {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectRoot);
-  const buildGradleContents = await fs.readFile(path.join(buildGradlePath), 'utf8');
-
-  if (hasLine(buildGradleContents, APPLY_EAS_BUILD_GRADLE_LINE)) {
-    return;
-  }
-
-  await fs.writeFile(
-    buildGradlePath,
-    `${buildGradleContents.trim()}\n${APPLY_EAS_BUILD_GRADLE_LINE}\n`
-  );
-}
-
-function hasLine(haystack: string, needle: string): boolean {
-  return (
-    haystack
-      .replace(/\r\n/g, '\n')
-      .split('\n')
-      // Check for both single and double quotes
-      .some(line => line === needle || line === needle.replace(/"/g, "'"))
-  );
-}
@@ -67,28 +67,26 @@ export async function resolveBuildPhaseErrorAsync(
  logLines: string[],
  errorContext: ErrorContext,
  buildLogsDirectory: string
-): Promise<errors.BuildError> {
+): Promise<errors.ExpoError> {
  const { phase } = errorContext;
-  if (error instanceof errors.BuildError) {
+  if (error instanceof errors.ExpoError) {
+    error.buildPhase ??= phase;
    return error;
  }
  const xcodeBuildLogs = await maybeReadXcodeBuildLogs(phase, buildLogsDirectory);
  const userError =
-    error instanceof errors.UserError
-      ? error
-      : (resolveError(userErrorHandlers, logLines, errorContext, xcodeBuildLogs) ??
-        new errors.UnknownError(errorContext.phase));
+    resolveError(userErrorHandlers, logLines, errorContext, xcodeBuildLogs) ??
+    new errors.UnknownError(errorContext.phase);
  const buildError = resolveError(buildErrorHandlers, logLines, errorContext, xcodeBuildLogs);

  const trackingCode =
    buildError && buildError.errorCode !== userError.errorCode ? buildError.errorCode : undefined;

-  return new errors.BuildError(userError.message, {
-    errorCode: userError.errorCode,
+  return new errors.UserError(userError.errorCode, userError.message, {
    trackingCode,
    docsUrl: userError.docsUrl,
-    cause: error,
    buildPhase: phase,
    metadata: buildError?.metadata,
+    cause: error,
  });
 }
@@ -0,0 +1,266 @@
+import { Android, BuildPhase, BuildPhaseResult } from '@expo/eas-build-job';
+import { vol } from 'memfs';
+
+import { createTestAndroidJob } from '../../__tests__/utils/job';
+import { createMockLogger } from '../../__tests__/utils/logger';
+import { BuildContext } from '../../context';
+import { restoreCredentials } from '../../android/credentials';
+import androidBuilder from '../android';
+import { runBuilderWithHooksAsync } from '../common';
+import {
+  injectConfigureVersionGradleConfig,
+  injectCredentialsGradleConfig,
+} from '../../steps/utils/android/gradleConfig';
+
+jest.mock('../common', () => ({
+  runBuilderWithHooksAsync: jest.fn(async (ctx, buildFn) => {
+    await buildFn(ctx);
+    return ctx.artifacts;
+  }),
+}));
+jest.mock('../custom', () => ({
+  runCustomBuildAsync: jest.fn(),
+}));
+jest.mock('../../android/credentials');
+jest.mock('../../android/gradle', () => ({
+  ensureLFLineEndingsInGradlewScript: jest.fn(),
+  resolveGradleCommand: jest.fn(() => ':app:bundleRelease'),
+  runGradleCommand: jest.fn(),
+}));
+jest.mock('../../common/eagerBundle', () => ({
+  eagerBundleAsync: jest.fn(),
+  shouldUseEagerBundle: jest.fn(() => false),
+}));
+jest.mock('../../common/prebuild', () => ({
+  prebuildAsync: jest.fn(),
+}));
+jest.mock('../../common/setup', () => ({
+  setupAsync: jest.fn(),
+}));
+jest.mock('../../steps/functions/restoreBuildCache', () => ({
+  cacheStatsAsync: jest.fn(),
+  restoreCcacheAsync: jest.fn(),
+}));
+jest.mock('../../steps/functions/saveBuildCache', () => ({
+  saveCcacheAsync: jest.fn(),
+}));
+jest.mock('../../steps/utils/android/gradleConfig', () => ({
+  ...jest.requireActual('../../steps/utils/android/gradleConfig'),
+  injectConfigureVersionGradleConfig: jest.fn(),
+  injectCredentialsGradleConfig: jest.fn(),
+}));
+jest.mock('../../utils/artifacts', () => ({
+  uploadApplicationArchive: jest.fn(),
+}));
+jest.mock('../../utils/expoUpdates', () => ({
+  configureExpoUpdatesIfInstalledAsync: jest.fn(),
+  resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync: jest.fn(async () => null),
+}));
+jest.mock('../../utils/hooks', () => ({
+  Hook: {
+    POST_INSTALL: 'POST_INSTALL',
+    PRE_UPLOAD_ARTIFACTS: 'PRE_UPLOAD_ARTIFACTS',
+  },
+  runHookIfPresent: jest.fn(),
+}));
+jest.mock('../../utils/prepareBuildExecutable', () => ({
+  prepareExecutableAsync: jest.fn(),
+}));
+
+describe(androidBuilder, () => {
+  beforeEach(() => {
+    vol.fromJSON(
+      {
+        '/workingdir/env/.gitkeep': '',
+        '/workingdir/build/package.json': JSON.stringify({
+          name: 'test-app',
+          version: '1.0.0',
+        }),
+      },
+      '/'
+    );
+  });
+
+  it('injects Android version config without build credentials', async () => {
+    const job: Android.Job = {
+      ...createTestAndroidJob(),
+      secrets: {
+        buildCredentials: undefined,
+      },
+      version: {
+        versionCode: '42',
+        versionName: '1.2.3',
+      },
+    };
+    const ctx = new BuildContext(job, {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
+    });
+
+    await androidBuilder(ctx);
+
+    expect(injectConfigureVersionGradleConfig).toHaveBeenCalledWith(
+      expect.anything(),
+      '/workingdir/build',
+      {
+        versionCode: '42',
+        versionName: '1.2.3',
+      }
+    );
+    expect(injectCredentialsGradleConfig).not.toHaveBeenCalled();
+    expect(restoreCredentials).not.toHaveBeenCalled();
+  });
+
+  it('injects Android credentials config when build credentials are present', async () => {
+    const ctx = new BuildContext(createTestAndroidJob(), {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
+    });
+
+    await androidBuilder(ctx);
+
+    expect(injectCredentialsGradleConfig).toHaveBeenCalledWith(
+      expect.anything(),
+      '/workingdir/build'
+    );
+    expect(restoreCredentials).toHaveBeenCalledWith(ctx);
+    expect(injectConfigureVersionGradleConfig).not.toHaveBeenCalled();
+  });
+
+  it('marks the configure Android version phase as warning for legacy eas-build.gradle', async () => {
+    const reportBuildPhaseStats = jest.fn();
+    const job: Android.Job = {
+      ...createTestAndroidJob(),
+      secrets: {
+        buildCredentials: undefined,
+      },
+      version: {
+        versionCode: '42',
+        versionName: '1.2.3',
+      },
+    };
+    const ctx = new BuildContext(job, {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
+    });
+    vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
+    vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
+
+    await androidBuilder(ctx);
+
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
+      expect.objectContaining({
+        buildPhase: BuildPhase.CONFIGURE_ANDROID_VERSION,
+        result: BuildPhaseResult.WARNING,
+      })
+    );
+  });
+
+  it('marks the prepare credentials phase as warning for legacy eas-build.gradle', async () => {
+    const reportBuildPhaseStats = jest.fn();
+    const ctx = new BuildContext(createTestAndroidJob(), {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
+    });
+    vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
+    vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
+
+    await androidBuilder(ctx);
+
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
+      expect.objectContaining({
+        buildPhase: BuildPhase.PREPARE_CREDENTIALS,
+        result: BuildPhaseResult.WARNING,
+      })
+    );
+  });
+
+  it('injects credentials and version config when both are configured', async () => {
+    const reportBuildPhaseStats = jest.fn();
+    const job: Android.Job = {
+      ...createTestAndroidJob(),
+      version: {
+        versionCode: '42',
+        versionName: '1.2.3',
+      },
+    };
+    const ctx = new BuildContext(job, {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
+    });
+    vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
+    vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
+
+    await androidBuilder(ctx);
+
+    expect(injectCredentialsGradleConfig).toHaveBeenCalledWith(
+      expect.anything(),
+      '/workingdir/build'
+    );
+    expect(restoreCredentials).toHaveBeenCalledWith(ctx);
+    expect(injectConfigureVersionGradleConfig).toHaveBeenCalledWith(
+      expect.anything(),
+      '/workingdir/build',
+      {
+        versionCode: '42',
+        versionName: '1.2.3',
+      }
+    );
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
+      expect.objectContaining({
+        buildPhase: BuildPhase.PREPARE_CREDENTIALS,
+        result: BuildPhaseResult.WARNING,
+      })
+    );
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
+      expect.objectContaining({
+        buildPhase: BuildPhase.CONFIGURE_ANDROID_VERSION,
+        result: BuildPhaseResult.WARNING,
+      })
+    );
+  });
+
+  it('runs the builder through hooks', async () => {
+    const ctx = new BuildContext(createTestAndroidJob(), {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
+    });
+
+    await androidBuilder(ctx);
+
+    expect(runBuilderWithHooksAsync).toHaveBeenCalledWith(ctx, expect.any(Function));
+  });
+});
@@ -10,13 +10,17 @@ import {
  resolveGradleCommand,
  runGradleCommand,
 } from '../android/gradle';
-import { configureBuildGradle } from '../android/gradleConfig';
 import { eagerBundleAsync, shouldUseEagerBundle } from '../common/eagerBundle';
 import { prebuildAsync } from '../common/prebuild';
 import { setupAsync } from '../common/setup';
 import { Artifacts, BuildContext, SkipNativeBuildError } from '../context';
 import { cacheStatsAsync, restoreCcacheAsync } from '../steps/functions/restoreBuildCache';
 import { saveCcacheAsync } from '../steps/functions/saveBuildCache';
+import {
+  injectConfigureVersionGradleConfig,
+  injectCredentialsGradleConfig,
+  warnIfLegacyEasBuildGradleExists,
+} from '../steps/utils/android/gradleConfig';
 import { uploadApplicationArchive } from '../utils/artifacts';
 import {
  configureExpoUpdatesIfInstalledAsync,
@@ -101,10 +105,22 @@ async function buildAsync(ctx: BuildContext<Android.Job>): Promise<void> {
    nullthrows(ctx.job.secrets, 'Secrets must be defined for non-custom builds').buildCredentials
  ) {
    await ctx.runBuildPhase(BuildPhase.PREPARE_CREDENTIALS, async () => {
+      await warnIfLegacyEasBuildGradleExists(ctx);
      await restoreCredentials(ctx);
-      await configureBuildGradle(ctx);
+      await injectCredentialsGradleConfig(ctx.logger, ctx.getReactNativeProjectDirectory());
    });
  }
+
+  if (ctx.job.version?.versionCode || ctx.job.version?.versionName) {
+    await ctx.runBuildPhase(BuildPhase.CONFIGURE_ANDROID_VERSION, async () => {
+      await warnIfLegacyEasBuildGradleExists(ctx);
+      await injectConfigureVersionGradleConfig(ctx.logger, ctx.getReactNativeProjectDirectory(), {
+        versionCode: ctx.job.version?.versionCode,
+        versionName: ctx.job.version?.versionName,
+      });
+    });
+  }
+
  await ctx.runBuildPhase(BuildPhase.CONFIGURE_EXPO_UPDATES, async () => {
    await configureExpoUpdatesIfInstalledAsync(ctx, {
      resolvedRuntimeVersion: resolvedExpoUpdatesRuntimeVersion?.runtimeVersion ?? null,
@@ -287,7 +287,7 @@ export class BuildContext<TJob extends Job = Job> {
  private async handleBuildPhaseErrorAsync(
    err: any,
    buildPhase: BuildPhase
-  ): Promise<errors.BuildError> {
+  ): Promise<errors.ExpoError> {
    const buildError = await resolveBuildPhaseErrorAsync(
      err,
      this.logBuffer.getPhaseLogs(buildPhase),
@@ -1,5 +1,6 @@
 import { Ios } from '@expo/eas-build-job';
 import { createLogger } from '@expo/logger';
+import crypto from 'crypto';

 import { provisioningProfile } from './fixtures';
 import { BuildContext } from '../../../context';
@@ -73,5 +74,45 @@ describe('ProvisioningProfile class', () => {
        await pp.destroy();
      }
    });
+
+    it('should match a certificate that is not at index 0 in DeveloperCertificates', async () => {
+      const pp = new ProvisioningProfile(
+        ctx,
+        Buffer.from(provisioningProfile.dataBase64, 'base64'),
+        keychain.data.path,
+        'testapp',
+        'Abc 123'
+      );
+
+      try {
+        await pp.init();
+
+        // Prepend an unrelated certificate so the real one moves to index 1
+        const dummyCert = Buffer.from('dummy-certificate-data');
+        (pp as any).developerCertificates = [dummyCert, ...(pp as any).developerCertificates];
+
+        // The original cert fingerprint should still match
+        expect(() => {
+          pp.verifyCertificate(provisioningProfile.certFingerprint);
+        }).not.toThrow();
+
+        // A non-matching fingerprint should still fail
+        expect(() => {
+          pp.verifyCertificate('2137');
+        }).toThrowError(/don't match/);
+
+        // The dummy cert's fingerprint should also match
+        const dummyFingerprint = crypto
+          .createHash('sha1')
+          .update(new Uint8Array(dummyCert))
+          .digest('hex')
+          .toUpperCase();
+        expect(() => {
+          pp.verifyCertificate(dummyFingerprint);
+        }).not.toThrow();
+      } finally {
+        await pp.destroy();
+      }
+    });
  });
 });
@@ -43,6 +43,7 @@ export default class ProvisioningProfile<TJob extends Ios.Job> {

  private readonly profilePath: string;
  private profileData?: ProvisioningProfileData;
+  private developerCertificates: Buffer[] = [];

  constructor(
    private readonly ctx: BuildContext<TJob>,
@@ -77,11 +78,12 @@ export default class ProvisioningProfile<TJob extends Ios.Job> {
  }

  public verifyCertificate(fingerprint: string): void {
-    const devCertFingerprint = this.genDerCertFingerprint();
-    if (devCertFingerprint !== fingerprint) {
+    const devCertFingerprints = this.getAllDerCertFingerprints();
+    if (!devCertFingerprints.includes(fingerprint)) {
      throw new errors.CredentialsDistCertMismatchError(
-        `Provisioning profile and distribution certificate don't match.
-Profile's certificate fingerprint = ${devCertFingerprint}, distribution certificate fingerprint = ${fingerprint}`
+        `Provisioning profile and distribution certificate don't match.\n` +
+          `Profile's certificate fingerprints = [${devCertFingerprints.join(', ')}], ` +
+          `distribution certificate fingerprint = ${fingerprint}`
      );
    }
  }
@@ -114,6 +116,10 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
    ] as string;
    const bundleIdentifier = applicationIdentifier.replace(/^.+?\./, '');

+    this.developerCertificates = (plistData.DeveloperCertificates as string[]).map((cert: string) =>
+      Buffer.from(cert, 'base64')
+    );
+
    this.profileData = {
      path: this.profilePath,
      target: this.target,
@@ -121,7 +127,7 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
      teamId: (plistData.TeamIdentifier as string[])[0],
      uuid: plistData.UUID as string,
      name: plistData.Name as string,
-      developerCertificate: Buffer.from((plistData.DeveloperCertificates as string[])[0], 'base64'),
+      developerCertificate: this.developerCertificates[0],
      certificateCommonName: this.certificateCommonName,
      distributionType: this.resolveDistributionType(plistData),
    };
@@ -137,11 +143,9 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
    }
  }

-  private genDerCertFingerprint(): string {
-    return crypto
-      .createHash('sha1')
-      .update(new Uint8Array(this.data.developerCertificate))
-      .digest('hex')
-      .toUpperCase();
+  private getAllDerCertFingerprints(): string[] {
+    return this.developerCertificates.map(cert =>
+      crypto.createHash('sha1').update(new Uint8Array(cert)).digest('hex').toUpperCase()
+    );
  }
 }
@@ -177,6 +177,34 @@ describe(createInternalEasMaestroTestFunction, () => {
    );
  });

+  it('generates per-attempt report filenames when retrying', async () => {
+    // Mock sequence:
+    // 1. xcrun simctl shutdown → succeeds (beforeEach default is fine)
+    // 2. maestro test attempt 0 → fails (triggers retry)
+    // 3. maestro test attempt 1 → succeeds (beforeEach default)
+    mockedSpawnAsync
+      .mockResolvedValueOnce(undefined as any) // xcrun simctl shutdown
+      .mockRejectedValueOnce(new Error('Maestro test failed')); // maestro attempt 0
+    // Attempt 1 falls through to beforeEach's mockResolvedValue default
+
+    const step = createStep({
+      callInputs: { output_format: 'junit', retries: 2 },
+    });
+    await step.executeAsync();
+
+    // Filter to just the maestro test command calls (skip xcrun simctl shutdown)
+    const maestroCalls = mockedSpawnAsync.mock.calls.filter(([cmd]) => cmd === 'maestro');
+    expect(maestroCalls).toHaveLength(2);
+
+    // Extract --output paths from maestro calls
+    const outputArgs = maestroCalls.map(([, args]) => args[args.indexOf('--output') + 1]);
+
+    expect(outputArgs[0]).toContain('attempt-0');
+    expect(outputArgs[1]).toContain('attempt-1');
+    // Filenames must be unique (not overwriting)
+    expect(outputArgs[0]).not.toBe(outputArgs[1]);
+  });
+
  it('fails Android flow when clone startup exhausts all attempts', async () => {
    mockedAndroidUtils.startAsync
      .mockResolvedValueOnce({
@@ -217,6 +217,217 @@ describe(parseMaestroResults, () => {
    ]);
  });

+  it('returns per-attempt results when multiple JUnit files exist for the same flow', async () => {
+    vol.fromJSON({
+      // Attempt 0: login FAILED
+      '/junit/junit-report-flow-1-attempt-0.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="1">',
+        '    <testcase id="login" name="login" classname="login" time="5.0" status="ERROR">',
+        '      <failure>Timeout</failure>',
+        '    </testcase>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // Attempt 1: login PASSED
+      '/junit/junit-report-flow-1-attempt-1.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="0">',
+        '    <testcase id="login" name="login" classname="login" time="3.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // ai-*.json metadata (2 timestamp dirs = 2 attempts)
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
+
+    // Should return 2 results — one per attempt
+    expect(results).toHaveLength(2);
+    expect(results).toEqual([
+      expect.objectContaining({
+        name: 'login',
+        path: '.maestro/login.yml',
+        status: 'failed',
+        errorMessage: 'Timeout',
+        duration: 5000,
+        retryCount: 0,
+      }),
+      expect.objectContaining({
+        name: 'login',
+        path: '.maestro/login.yml',
+        status: 'passed',
+        errorMessage: null,
+        duration: 3000,
+        retryCount: 1,
+      }),
+    ]);
+  });
+
+  it('returns per-attempt results for reuse_devices=true (all flows in every attempt)', async () => {
+    vol.fromJSON({
+      // Attempt 0: home FAILED, login PASSED
+      '/junit-reports/android-maestro-junit-attempt-0.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="2" failures="1">',
+        '    <testcase id="home" name="home" classname="home" time="5.0" status="ERROR">',
+        '      <failure>Timeout</failure>',
+        '    </testcase>',
+        '    <testcase id="login" name="login" classname="login" time="3.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // Attempt 1: both PASSED
+      '/junit-reports/android-maestro-junit-attempt-1.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="2" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="4.0" status="SUCCESS"/>',
+        '    <testcase id="login" name="login" classname="login" time="2.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/junit-reports', '/tests', '/root/project');
+
+    // 4 results: 2 flows × 2 attempts
+    expect(results).toHaveLength(4);
+    expect(results).toEqual([
+      expect.objectContaining({ name: 'home', status: 'failed', retryCount: 0 }),
+      expect.objectContaining({ name: 'home', status: 'passed', retryCount: 1 }),
+      expect.objectContaining({ name: 'login', status: 'passed', retryCount: 0 }),
+      expect.objectContaining({ name: 'login', status: 'passed', retryCount: 1 }),
+    ]);
+  });
+
+  it('returns per-attempt results with sharding (multiple testsuites per attempt file)', async () => {
+    vol.fromJSON({
+      // Attempt 0: shard 1 has home (FAILED), shard 2 has login (PASSED)
+      '/junit-reports/android-maestro-junit-attempt-0.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" device="emulator-5554" tests="1" failures="1">',
+        '    <testcase id="home" name="home" classname="home" time="5.0" status="ERROR">',
+        '      <failure>Timeout</failure>',
+        '    </testcase>',
+        '  </testsuite>',
+        '  <testsuite name="Test Suite" device="emulator-5556" tests="1" failures="0">',
+        '    <testcase id="login" name="login" classname="login" time="3.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // Attempt 1: all passed across shards
+      '/junit-reports/android-maestro-junit-attempt-1.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" device="emulator-5554" tests="1" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="4.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '  <testsuite name="Test Suite" device="emulator-5556" tests="1" failures="0">',
+        '    <testcase id="login" name="login" classname="login" time="2.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/junit-reports', '/tests', '/root/project');
+
+    expect(results).toHaveLength(4);
+    expect(results).toEqual([
+      expect.objectContaining({ name: 'home', status: 'failed', retryCount: 0 }),
+      expect.objectContaining({ name: 'home', status: 'passed', retryCount: 1 }),
+      expect.objectContaining({ name: 'login', status: 'passed', retryCount: 0 }),
+      expect.objectContaining({ name: 'login', status: 'passed', retryCount: 1 }),
+    ]);
+  });
+
+  it('backward compat: reuse_devices=true with retries but old single JUnit file', async () => {
+    vol.fromJSON({
+      // Single overwritten JUnit (only has final attempt's results)
+      '/maestro-tests/android-maestro-junit.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="2" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="4.0" status="SUCCESS"/>',
+        '    <testcase id="login" name="login" classname="login" time="2.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // 2 timestamp dirs — both flows appear in both (entire suite retried)
+      '/maestro-tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/maestro-tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/maestro-tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/maestro-tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/maestro-tests', '/maestro-tests', '/root/project');
+
+    // Both flows have 2 occurrences → retryCount = 1 for both
+    expect(results).toHaveLength(2);
+    expect(results).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ name: 'home', status: 'passed', retryCount: 1 }),
+        expect.objectContaining({ name: 'login', status: 'passed', retryCount: 1 }),
+      ])
+    );
+  });
+
  it('handles reuse_devices=false (separate junit_report_directory)', async () => {
    vol.fromJSON({
      // JUnit in temp dir (per-flow files)
@@ -238,6 +238,45 @@ describe(createReportMaestroTestResultsFunction, () => {
    expect(mockGraphqlClient.mutation).not.toHaveBeenCalled();
  });

+  it('sends per-attempt results with same name but different retryCount', async () => {
+    vol.fromJSON({
+      // Two JUnit files for same flow (per-attempt)
+      '/junit/junit-report-flow-1-attempt-0.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="1">',
+        '    <testcase id="home" name="home" classname="home" time="5.0" status="ERROR">',
+        '      <failure>Tap failed</failure>',
+        '    </testcase>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      '/junit/junit-report-flow-1-attempt-1.xml': JUNIT_PASS,
+      '/tests/2026-01-28_055409/ai-home.json': FLOW_AI,
+      '/tests/2026-01-28_055420/ai-home.json': FLOW_AI,
+    });
+
+    mockMutationFn.mockResolvedValue({
+      data: {
+        workflowDeviceTestCaseResult: {
+          createWorkflowDeviceTestCaseResults: [{ id: 'id-1' }, { id: 'id-2' }],
+        },
+      },
+    });
+
+    await createStep().executeAsync();
+
+    expect(mockGraphqlClient.mutation).toHaveBeenCalledTimes(1);
+    const [, variables] = (mockGraphqlClient.mutation as jest.Mock).mock.calls[0];
+    expect(variables.input.testCaseResults).toHaveLength(2);
+    expect(variables.input.testCaseResults[0]).toEqual(
+      expect.objectContaining({ name: 'home', status: 'FAILED', retryCount: 0 })
+    );
+    expect(variables.input.testCaseResults[1]).toEqual(
+      expect.objectContaining({ name: 'home', status: 'PASSED', retryCount: 1 })
+    );
+  });
+
  it('uses default directories when inputs are not provided', async () => {
    vol.fromJSON({
      '/home/expo/.maestro/tests/report.xml': JUNIT_PASS,
@@ -214,18 +214,17 @@ export function createInternalEasMaestroTestFunction(ctx: CustomBuildContext): B
      for (const [flowIndex, flowPath] of flowPathsToExecute.entries()) {
        stepCtx.logger.info('');

-        // If output_format is empty or noop, we won't use this.
-        const outputPath = path.join(
-          maestroReportsDir,
-          [
-            `${output_format ? output_format + '-' : ''}report-flow-${flowIndex + 1}`,
-            MaestroOutputFormatToExtensionMap[output_format ?? 'noop'],
-          ]
-            .filter(Boolean)
-            .join('.')
-        );
-
        for (let attemptCount = 0; attemptCount < retries; attemptCount++) {
+          // Generate unique report path per attempt (not overwritten on retry)
+          const outputPath = path.join(
+            maestroReportsDir,
+            [
+              `${output_format ? output_format + '-' : ''}report-flow-${flowIndex + 1}-attempt-${attemptCount}`,
+              MaestroOutputFormatToExtensionMap[output_format ?? 'noop'],
+            ]
+              .filter(Boolean)
+              .join('.')
+          );
          const localDeviceName = `eas-simulator-${flowIndex}-${attemptCount}` as
            | IosSimulatorName
            | AndroidVirtualDeviceName;
@@ -276,12 +275,11 @@ export function createInternalEasMaestroTestFunction(ctx: CustomBuildContext): B
          if (logsResult?.ok) {
            try {
              const extension = path.extname(logsResult.value.outputPath);
-              const destinationPath = path.join(deviceLogsDir, `flow-${flowIndex}${extension}`);
+              const destinationPath = path.join(
+                deviceLogsDir,
+                `flow-${flowIndex}-attempt-${attemptCount}${extension}`
+              );

-              await fs.promises.rm(destinationPath, {
-                force: true,
-                recursive: true,
-              });
              await fs.promises.rename(logsResult.value.outputPath, destinationPath);
            } catch (err) {
              stepCtx.logger.warn({ err }, 'Failed to prepare device logs for upload.');
@@ -38,6 +38,79 @@ const xmlParser = new XMLParser({
  isArray: name => ['testsuite', 'testcase', 'property'].includes(name),
 });

+// Internal helper — not exported. Parses a single JUnit XML file.
+async function parseJUnitFile(filePath: string): Promise<JUnitTestCaseResult[]> {
+  const results: JUnitTestCaseResult[] = [];
+  try {
+    const content = await fs.readFile(filePath, 'utf-8');
+    const parsed = xmlParser.parse(content);
+
+    const testsuites = parsed?.testsuites?.testsuite;
+    if (!Array.isArray(testsuites)) {
+      return results;
+    }
+
+    for (const suite of testsuites) {
+      const testcases = suite?.testcase;
+      if (!Array.isArray(testcases)) {
+        continue;
+      }
+
+      for (const tc of testcases) {
+        const name = tc['@_name'];
+        if (!name) {
+          continue;
+        }
+
+        const timeStr = tc['@_time'];
+        const timeSeconds = timeStr ? parseFloat(timeStr) : 0;
+        const duration = Number.isFinite(timeSeconds) ? Math.round(timeSeconds * 1000) : 0;
+
+        const status: 'passed' | 'failed' = tc['@_status'] === 'SUCCESS' ? 'passed' : 'failed';
+        const failureText =
+          tc.failure != null
+            ? typeof tc.failure === 'string'
+              ? tc.failure
+              : (tc.failure?.['#text'] ?? null)
+            : null;
+        const errorText =
+          tc.error != null
+            ? typeof tc.error === 'string'
+              ? tc.error
+              : (tc.error?.['#text'] ?? null)
+            : null;
+        const errorMessage: string | null = failureText ?? errorText ?? null;
+
+        const rawProperties: { '@_name': string; '@_value': string }[] =
+          tc.properties?.property ?? [];
+        const properties: Record<string, string> = {};
+        for (const prop of rawProperties) {
+          const propName = prop['@_name'];
+          const value = prop['@_value'];
+          if (typeof propName !== 'string' || typeof value !== 'string') {
+            continue;
+          }
+          properties[propName] = value;
+        }
+
+        const tagsValue = properties['tags'];
+        const tags: string[] = tagsValue
+          ? tagsValue
+              .split(',')
+              .map(t => t.trim())
+              .filter(Boolean)
+          : [];
+        delete properties['tags'];
+
+        results.push({ name, status, duration, errorMessage, tags, properties });
+      }
+    }
+  } catch {
+    // Skip malformed XML files
+  }
+  return results;
+}
+
 export async function parseJUnitTestCases(junitDirectory: string): Promise<JUnitTestCaseResult[]> {
  let entries: string[];
  try {
@@ -52,83 +125,9 @@ export async function parseJUnitTestCases(junitDirectory: string): Promise<JUnit
  }

  const results: JUnitTestCaseResult[] = [];
-
  for (const xmlFile of xmlFiles) {
-    try {
-      const content = await fs.readFile(path.join(junitDirectory, xmlFile), 'utf-8');
-      const parsed = xmlParser.parse(content);
-
-      const testsuites = parsed?.testsuites?.testsuite;
-      if (!Array.isArray(testsuites)) {
-        continue;
-      }
-
-      for (const suite of testsuites) {
-        const testcases = suite?.testcase;
-        if (!Array.isArray(testcases)) {
-          continue;
-        }
-
-        for (const tc of testcases) {
-          const name = tc['@_name'];
-          if (!name) {
-            continue;
-          }
-
-          const timeStr = tc['@_time'];
-          const timeSeconds = timeStr ? parseFloat(timeStr) : 0;
-          const duration = Number.isFinite(timeSeconds) ? Math.round(timeSeconds * 1000) : 0;
-
-          // Use @_status as primary indicator (more robust than checking <failure> presence)
-          const status: 'passed' | 'failed' = tc['@_status'] === 'SUCCESS' ? 'passed' : 'failed';
-          // Extract error message from <failure> or <error> elements
-          const failureText =
-            tc.failure != null
-              ? typeof tc.failure === 'string'
-                ? tc.failure
-                : (tc.failure?.['#text'] ?? null)
-              : null;
-          const errorText =
-            tc.error != null
-              ? typeof tc.error === 'string'
-                ? tc.error
-                : (tc.error?.['#text'] ?? null)
-              : null;
-          const errorMessage: string | null = failureText ?? errorText ?? null;
-
-          // Extract properties
-          const rawProperties: { '@_name': string; '@_value': string }[] =
-            tc.properties?.property ?? [];
-          const properties: Record<string, string> = {};
-
-          for (const prop of rawProperties) {
-            const propName = prop['@_name'];
-            const value = prop['@_value'];
-            if (typeof propName !== 'string' || typeof value !== 'string') {
-              continue;
-            }
-            properties[propName] = value;
-          }
-
-          // Extract tags from "tags" property (Maestro 2.2.0+, comma-separated)
-          const tagsValue = properties['tags'];
-          const tags: string[] = tagsValue
-            ? tagsValue
-                .split(',')
-                .map(t => t.trim())
-                .filter(Boolean)
-            : [];
-          delete properties['tags'];
-
-          results.push({ name, status, duration, errorMessage, tags, properties });
-        }
-      }
-    } catch {
-      // Skip malformed XML files
-      continue;
-    }
+    results.push(...(await parseJUnitFile(path.join(junitDirectory, xmlFile))));
  }
-
  return results;
 }

@@ -167,9 +166,32 @@ export async function parseMaestroResults(
  testsDirectory: string,
  projectRoot: string
 ): Promise<MaestroFlowResult[]> {
-  // 1. Parse JUnit XML files (primary source)
-  const junitResults = await parseJUnitTestCases(junitDirectory);
-  if (junitResults.length === 0) {
+  // 1. Parse JUnit XML files, tracking which file each result came from
+  let junitEntries: string[];
+  try {
+    junitEntries = await fs.readdir(junitDirectory);
+  } catch {
+    return [];
+  }
+  const xmlFiles = junitEntries.filter(f => f.endsWith('.xml')).sort();
+  if (xmlFiles.length === 0) {
+    return [];
+  }
+
+  interface JUnitResultWithSource {
+    result: JUnitTestCaseResult;
+    sourceFile: string;
+  }
+
+  const junitResultsWithSource: JUnitResultWithSource[] = [];
+  for (const xmlFile of xmlFiles) {
+    const fileResults = await parseJUnitFile(path.join(junitDirectory, xmlFile));
+    for (const result of fileResults) {
+      junitResultsWithSource.push({ result, sourceFile: xmlFile });
+    }
+  }
+
+  if (junitResultsWithSource.length === 0) {
    return [];
  }

@@ -217,25 +239,63 @@ export async function parseMaestroResults(
  // 3. Merge: JUnit results + ai-*.json metadata
  const results: MaestroFlowResult[] = [];

-  for (const junit of junitResults) {
-    const flowFilePath = flowPathMap.get(junit.name);
+  // Parse attempt index from filename pattern: *-attempt-N.*
+  const ATTEMPT_PATTERN = /attempt-(\d+)/;
+
+  // Group results by flow name
+  const resultsByName = new Map<string, JUnitResultWithSource[]>();
+  for (const entry of junitResultsWithSource) {
+    const group = resultsByName.get(entry.result.name) ?? [];
+    group.push(entry);
+    resultsByName.set(entry.result.name, group);
+  }
+
+  for (const [flowName, flowEntries] of resultsByName) {
+    const flowFilePath = flowPathMap.get(flowName);
    const relativePath = flowFilePath
      ? await relativizePathAsync(flowFilePath, projectRoot)
-      : junit.name; // fallback: use flow name if ai-*.json not found
+      : flowName;

-    const occurrences = flowOccurrences.get(junit.name) ?? 0;
-    const retryCount = Math.max(0, occurrences - 1);
+    if (flowEntries.length === 1) {
+      // Single result for this flow — use ai-*.json occurrence count for retryCount
+      // (backward compat with old-style single JUnit file that gets overwritten)
+      const { result } = flowEntries[0];
+      const occurrences = flowOccurrences.get(flowName) ?? 0;
+      const retryCount = Math.max(0, occurrences - 1);

-    results.push({
-      name: junit.name,
-      path: relativePath,
-      status: junit.status,
-      errorMessage: junit.errorMessage,
-      duration: junit.duration,
-      retryCount,
-      tags: junit.tags,
-      properties: junit.properties,
-    });
+      results.push({
+        name: flowName,
+        path: relativePath,
+        status: result.status,
+        errorMessage: result.errorMessage,
+        duration: result.duration,
+        retryCount,
+        tags: result.tags,
+        properties: result.properties,
+      });
+    } else {
+      // Multiple results — per-attempt JUnit files. Sort by attempt index from filename.
+      const sorted = flowEntries
+        .map(entry => {
+          const match = entry.sourceFile.match(ATTEMPT_PATTERN);
+          const attemptIndex = match ? parseInt(match[1], 10) : 0;
+          return { ...entry, attemptIndex };
+        })
+        .sort((a, b) => a.attemptIndex - b.attemptIndex);
+
+      for (const { result, attemptIndex } of sorted) {
+        results.push({
+          name: flowName,
+          path: relativePath,
+          status: result.status,
+          errorMessage: result.errorMessage,
+          duration: result.duration,
+          retryCount: attemptIndex,
+          tags: result.tags,
+          properties: result.properties,
+        });
+      }
+    }
  }

  return results;
@@ -64,14 +64,21 @@ export function createReportMaestroTestResultsFunction(ctx: CustomBuildContext):
          return;
        }

-        // Maestro allows overriding flow names via config, so different flow files can share
-        // the same name. JUnit XML only contains names (not file paths), making it impossible
-        // to map duplicates back to their original flow files. Skip and let the user fix it.
-        const names = flowResults.map(r => r.name);
-        const duplicates = names.filter((n, i) => names.indexOf(n) !== i);
-        if (duplicates.length > 0) {
+        // Detect truly conflicting results: same (name, retryCount) pair means different flow files
+        // share the same name (Maestro config override), which we can't disambiguate.
+        // Same name with different retryCount is expected (per-attempt results from retries).
+        const seen = new Set<string>();
+        const conflicting = new Set<string>();
+        for (const r of flowResults) {
+          const key = `${r.name}:${r.retryCount}`;
+          if (seen.has(key)) {
+            conflicting.add(r.name);
+          }
+          seen.add(key);
+        }
+        if (conflicting.size > 0) {
          logger.error(
-            `Duplicate test case names found in JUnit output: ${[...new Set(duplicates)].join(
+            `Duplicate test case names found in JUnit output: ${[...conflicting].join(
              ', '
            )}. Skipping report. Ensure each Maestro flow has a unique name.`
          );
@@ -33,7 +33,7 @@ export async function runGradleCommand({
        return line;
      }
    },
-    env: { ...env, ...extraEnv },
+    env: { ...env, ...extraEnv, LC_ALL: 'C.UTF-8' },
  });
  if (env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux') {
    adjustOOMScore(spawnPromise, logger);
@@ -1,4 +1,5 @@
 import { AndroidConfig } from '@expo/config-plugins';
+import { Android } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { templateString } from '@expo/template-file';
 import fs from 'fs-extra';
@@ -6,6 +7,7 @@ import path from 'path';

 import { EasBuildConfigureVersionGradleTemplate } from '../../../templates/EasBuildConfigureVersionGradle';
 import { EasBuildInjectAndroidCredentialsGradle } from '../../../templates/EasBuildInjectAndroidCredentialsGradle';
+import { BuildContext } from '../../../context';

 const APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE =
  'apply from: "./eas-build-inject-android-credentials.gradle"';
@@ -51,6 +53,26 @@ async function deleteEasBuildConfigureVersionGradle(workingDir: string): Promise
  await fs.remove(targetPath);
 }

+let legacyEasBuildGradleWarningEmitted = false;
+
+export async function warnIfLegacyEasBuildGradleExists(
+  ctx: BuildContext<Android.Job>
+): Promise<void> {
+  const legacyGradlePath = getLegacyEasBuildGradlePath(ctx.getReactNativeProjectDirectory());
+  if (
+    (await fs.pathExists(legacyGradlePath)) &&
+    (process.env.NODE_ENV === 'test' || !legacyEasBuildGradleWarningEmitted)
+  ) {
+    legacyEasBuildGradleWarningEmitted = true;
+    ctx.logger.warn('eas-build.gradle script is deprecated, please remove it from your project.');
+    ctx.markBuildPhaseHasWarnings();
+  }
+}
+
+function getLegacyEasBuildGradlePath(projectRoot: string): string {
+  return path.join(projectRoot, 'android/app/eas-build.gradle');
+}
+
 function getEasBuildInjectCredentialsGradlePath(workingDir: string): string {
  return path.join(workingDir, 'android/app/eas-build-inject-android-credentials.gradle');
 }
@@ -113,7 +135,7 @@ function hasLine(haystack: string, needle: string): boolean {
    haystack
      .replace(/\r\n/g, '\n')
      .split('\n')
-      // Check for both single and double quotes
+      // Check for both single and double quotes.
      .some(line => line === needle || line === needle.replace(/"/g, "'"))
  );
 }
@@ -42,6 +42,7 @@ export default class ProvisioningProfile {

  private readonly profilePath: string;
  private profileData?: ProvisioningProfileData;
+  private developerCertificates: Buffer[] = [];

  constructor(
    private readonly profile: Buffer,
@@ -73,11 +74,12 @@ export default class ProvisioningProfile {
  }

  public verifyCertificate(fingerprint: string): void {
-    const devCertFingerprint = this.genDerCertFingerprint();
-    if (devCertFingerprint !== fingerprint) {
+    const devCertFingerprints = this.getAllDerCertFingerprints();
+    if (!devCertFingerprints.includes(fingerprint)) {
      throw new errors.CredentialsDistCertMismatchError(
-        `Provisioning profile and distribution certificate don't match.
-Profile's certificate fingerprint = ${devCertFingerprint}, distribution certificate fingerprint = ${fingerprint}`
+        `Provisioning profile and distribution certificate don't match.\n` +
+          `Profile's certificate fingerprints = [${devCertFingerprints.join(', ')}], ` +
+          `distribution certificate fingerprint = ${fingerprint}`
      );
    }
  }
@@ -110,6 +112,10 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
    ] as string;
    const bundleIdentifier = applicationIdentifier.replace(/^.+?\./, '');

+    this.developerCertificates = (plistData.DeveloperCertificates as string[]).map((cert: string) =>
+      Buffer.from(cert, 'base64')
+    );
+
    this.profileData = {
      path: this.profilePath,
      target: this.target,
@@ -117,7 +123,7 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
      teamId: (plistData.TeamIdentifier as string[])[0],
      uuid: plistData.UUID as string,
      name: plistData.Name as string,
-      developerCertificate: Buffer.from((plistData.DeveloperCertificates as string[])[0], 'base64'),
+      developerCertificate: this.developerCertificates[0],
      certificateCommonName: this.certificateCommonName,
      distributionType: this.resolveDistributionType(plistData),
    };
@@ -133,11 +139,9 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
    }
  }

-  private genDerCertFingerprint(): string {
-    return crypto
-      .createHash('sha1')
-      .update(new Uint8Array(this.data.developerCertificate))
-      .digest('hex')
-      .toUpperCase();
+  private getAllDerCertFingerprints(): string[] {
+    return this.developerCertificates.map(cert =>
+      crypto.createHash('sha1').update(new Uint8Array(cert)).digest('hex').toUpperCase()
+    );
  }
 }
@@ -1,54 +0,0 @@
-export const EasBuildGradle = `// Build integration with EAS
-
-import java.nio.file.Paths
-
-def versionCodeFromEnv = System.getenv("EAS_BUILD_ANDROID_VERSION_CODE")
-def versionNameFromEnv = System.getenv("EAS_BUILD_ANDROID_VERSION_NAME")
-
-android {
-  defaultConfig {
-    if (versionCodeFromEnv) {
-      versionCode = Integer.parseInt(versionCodeFromEnv)
-    }
-    if (versionNameFromEnv) {
-      versionName = versionNameFromEnv
-    }
-  }
-  applicationVariants.all { variant ->
-    variant.outputs.each { output ->
-      if (versionCodeFromEnv) {
-        output.versionCodeOverride = Integer.parseInt(versionCodeFromEnv)
-      }
-      if (versionNameFromEnv) {
-        output.versionNameOverride = versionNameFromEnv
-      }
-    }
-  }
-  signingConfigs {
-    release {
-      def credentialsJson = Paths.get(System.getenv("EAS_BUILD_WORKINGDIR")).resolve("credentials.json").toFile();
-      def credentials = new groovy.json.JsonSlurper().parse(credentialsJson)
-      def keystorePath = Paths.get(credentials.android.keystore.keystorePath);
-
-      storeFile keystorePath.toFile()
-      storePassword credentials.android.keystore.keystorePassword
-      keyAlias credentials.android.keystore.keyAlias
-      if (credentials.android.keystore.containsKey("keyPassword")) {
-        keyPassword credentials.android.keystore.keyPassword
-      } else {
-        // key password is required by Gradle, but PKCS keystores don't have one
-        // using the keystore password seems to satisfy the requirement
-        keyPassword credentials.android.keystore.keystorePassword
-      }
-    }
-  }
-
-  buildTypes {
-    release {
-      signingConfig android.signingConfigs.release
-    }
-    debug {
-      signingConfig android.signingConfigs.release
-    }
-  }
-}`;
@@ -1,6 +1,6 @@
 {
  "name": "create-eas-build-function",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "description": "Create functions for use in EAS Build custom builds.",
  "keywords": [
    "expo",
@@ -35,7 +35,7 @@
    "clean": "rimraf ./build/ \"*.tsbuildinfo\""
  },
  "dependencies": {
-    "@expo/steps": "18.2.0"
+    "@expo/steps": "18.4.0"
  },
  "devDependencies": {
    "@expo/package-manager": "1.9.10",
@@ -1,6 +1,6 @@
 {
  "name": "@expo/eas-build-job",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "MIT",
  "author": "Expo <[email protected]>",
@@ -1,8 +1,10 @@
-import { BuildError, ExpoError, UserError } from '../errors';
+import { ErrorCode, ExpoError, SystemError, UserError } from '../errors';
 import { BuildPhase } from '../logs';

+type ExpoErrorDetails = ConstructorParameters<typeof ExpoError>[1];
+
 class TestExpoError extends ExpoError {
-  constructor(message: string, details: ConstructorParameters<typeof BuildError>[1]) {
+  constructor(message: string, details: ExpoErrorDetails) {
    super(message, details);
  }
 }
@@ -27,27 +29,7 @@ describe(ExpoError, () => {
    });
    expect(error.buildPhase).toBe(BuildPhase.PREBUILD);
    expect(error.cause).toBe(cause);
-    expect(error.format()).toEqual({
-      errorCode: 'ERR_CODE',
-      message: 'canonical message',
-      docsUrl: 'https://docs.example.dev',
-      buildPhase: BuildPhase.PREBUILD,
-    });
-  });
-});
-
-describe(BuildError, () => {
-  it('formats using canonical message and errorCode', () => {
-    const error = new BuildError('canonical message', {
-      errorCode: 'ERR_CODE',
-      docsUrl: 'https://docs.example.dev',
-      buildPhase: BuildPhase.PREBUILD,
-      metadata: { packageName: '@expo/config' },
-    });
-
-    expect(error).toBeInstanceOf(ExpoError);
-    expect(error.metadata).toEqual({ packageName: '@expo/config' });
-    expect(error.format()).toEqual({
+    expect(error.toExternalExpoError()).toEqual({
      errorCode: 'ERR_CODE',
      message: 'canonical message',
      docsUrl: 'https://docs.example.dev',
@@ -74,6 +56,16 @@ describe(UserError, () => {
    expect(error.cause).toBe(cause);
  });

+  it('supports trackingCode and buildPhase in options', () => {
+    const error = new UserError('ERR_CODE', 'message', {
+      trackingCode: 'TRACKING_CODE',
+      buildPhase: BuildPhase.PREBUILD,
+    });
+
+    expect(error.trackingCode).toBe('TRACKING_CODE');
+    expect(error.buildPhase).toBe(BuildPhase.PREBUILD);
+  });
+
  it('supports docsUrl, metadata, and cause in options', () => {
    const cause = new Error('root cause');
    const error = new UserError('ERR_CODE', 'message', {
@@ -87,3 +79,30 @@ describe(UserError, () => {
    expect(error.cause).toBe(cause);
  });
 });
+
+describe(SystemError, () => {
+  it('always formats with SERVER_ERROR and preserves trackingCode', () => {
+    const cause = new Error('root cause');
+    const error = new SystemError('system message', {
+      trackingCode: 'TRACKING_CODE',
+      docsUrl: 'https://docs.example.dev',
+      buildPhase: BuildPhase.PREBUILD,
+      metadata: { packageName: '@expo/config' },
+      cause,
+    });
+
+    expect(error).toBeInstanceOf(ExpoError);
+    expect(error.errorCode).toBe(ErrorCode.SERVER_ERROR);
+    expect(error.trackingCode).toBe('TRACKING_CODE');
+    expect(error.docsUrl).toBe('https://docs.example.dev');
+    expect(error.metadata).toEqual({ packageName: '@expo/config' });
+    expect(error.buildPhase).toBe(BuildPhase.PREBUILD);
+    expect(error.cause).toBe(cause);
+    expect(error.toExternalExpoError()).toEqual({
+      errorCode: ErrorCode.SERVER_ERROR,
+      message: 'system message',
+      docsUrl: 'https://docs.example.dev',
+      buildPhase: BuildPhase.PREBUILD,
+    });
+  });
+});
@@ -54,7 +54,10 @@ export abstract class ExpoError<TMetadata extends ErrorMetadata = ErrorMetadata>
    this.buildPhase = details.buildPhase;
  }

-  public format(): ExternalBuildError {
+  /**
+   * Serialized error payload used by the orchestrator-worker API.
+   */
+  public toExternalExpoError(): ExternalBuildError {
    return {
      errorCode: this.errorCode,
      message: this.message,
@@ -64,29 +67,49 @@ export abstract class ExpoError<TMetadata extends ErrorMetadata = ErrorMetadata>
  }
 }

-export class BuildError<
-  TMetadata extends ErrorMetadata = ErrorMetadata,
-> extends ExpoError<TMetadata> {
-  constructor(message: string, details: ExpoErrorDetails<TMetadata>) {
-    super(message, details);
-  }
-}
-
 export class UserError<
  TMetadata extends ErrorMetadata = ErrorMetadata,
 > extends ExpoError<TMetadata> {
  constructor(
    public errorCode: string,
-    public message: string,
+    message: string,
    options?: {
+      trackingCode?: string;
      docsUrl?: string;
+      buildPhase?: BuildPhase;
      metadata?: TMetadata;
      cause?: unknown;
    }
  ) {
    super(message, {
      errorCode,
+      trackingCode: options?.trackingCode,
      docsUrl: options?.docsUrl,
+      buildPhase: options?.buildPhase,
+      metadata: options?.metadata,
+      cause: options?.cause,
+    });
+  }
+}
+
+export class SystemError<
+  TMetadata extends ErrorMetadata = ErrorMetadata,
+> extends ExpoError<TMetadata> {
+  constructor(
+    message: string,
+    options?: {
+      trackingCode?: string;
+      docsUrl?: string;
+      buildPhase?: BuildPhase;
+      metadata?: TMetadata;
+      cause?: unknown;
+    }
+  ) {
+    super(message, {
+      errorCode: ErrorCode.SERVER_ERROR,
+      trackingCode: options?.trackingCode,
+      docsUrl: options?.docsUrl,
+      buildPhase: options?.buildPhase,
      metadata: options?.metadata,
      cause: options?.cause,
    });
@@ -99,28 +122,25 @@ export class UnknownError extends UserError {
      ErrorCode.UNKNOWN_ERROR,
      buildPhase
        ? `Unknown error. See logs of the ${buildPhaseDisplayName[buildPhase]} build phase for more information.`
-        : 'Unknown error. See logs for more information.'
+        : 'Unknown error. See logs for more information.',
+      { buildPhase }
    );
  }
 }

-export class UnknownBuildError extends BuildError {
+export class UnknownBuildError extends UserError {
  constructor() {
    const errorCode = ErrorCode.UNKNOWN_ERROR;
    const message = 'Unknown error. See logs for more information.';
-    super(message, {
-      errorCode,
-    });
+    super(errorCode, message);
  }
 }

-export class UnknownCustomBuildError extends BuildError {
+export class UnknownCustomBuildError extends UserError {
  constructor() {
    const errorCode = ErrorCode.UNKNOWN_CUSTOM_BUILD_ERROR;
    const message = 'Unknown custom build error. See logs for more information.';
-    super(message, {
-      errorCode,
-    });
+    super(errorCode, message);
  }
 }

@@ -178,7 +178,7 @@ ALIASES
  $ eas login
 ```

-_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -195,7 +195,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/account/logout.ts)_

 ## `eas account:usage [ACCOUNT_NAME]`

@@ -217,7 +217,7 @@ DESCRIPTION
  view account usage and billing for the current cycle
 ```

-_See code: [packages/eas-cli/src/commands/account/usage.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/account/usage.ts)_
+_See code: [packages/eas-cli/src/commands/account/usage.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/account/usage.ts)_

 ## `eas account:view`

@@ -234,7 +234,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -248,7 +248,7 @@ DESCRIPTION
  display or change analytics settings
 ```

-_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -300,7 +300,7 @@ DESCRIPTION
  create a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -321,7 +321,7 @@ DESCRIPTION
  delete a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -341,7 +341,7 @@ DESCRIPTION
  list all branches
 ```

-_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -361,7 +361,7 @@ DESCRIPTION
  rename a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -384,7 +384,7 @@ DESCRIPTION
  view a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/branch/view.ts)_

 ## `eas build`

@@ -422,7 +422,7 @@ DESCRIPTION
  start a build
 ```

-_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -442,7 +442,7 @@ DESCRIPTION
  cancel a build
 ```

-_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -460,7 +460,7 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

-_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:delete [BUILD_ID]`

@@ -480,7 +480,7 @@ DESCRIPTION
  delete a build
 ```

-_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/delete.ts)_
+_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/delete.ts)_

 ## `eas build:dev`

@@ -488,19 +488,20 @@ run dev client simulator/emulator build with matching fingerprint or create a ne

 ```
 USAGE
-  $ eas build:dev [-p ios|android] [-e PROFILE_NAME]
+  $ eas build:dev [-p ios|android] [-e PROFILE_NAME] [--skip-build-if-not-found]

 FLAGS
-  -e, --profile=PROFILE_NAME  Name of the build profile from eas.json. It must be a profile allowing to create
-                              emulator/simulator internal distribution dev client builds. The "development-simulator"
-                              build profile will be selected by default.
-  -p, --platform=<option>     <options: ios|android>
+  -e, --profile=PROFILE_NAME     Name of the build profile from eas.json. It must be a profile allowing to create
+                                 emulator/simulator internal distribution dev client builds. The "development-simulator"
+                                 build profile will be selected by default.
+  -p, --platform=<option>        <options: ios|android>
+      --skip-build-if-not-found  Skip build if no successful build with matching fingerprint is found.

 DESCRIPTION
  run dev client simulator/emulator build with matching fingerprint or create a new one
 ```

-_See code: [packages/eas-cli/src/commands/build/dev.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/dev.ts)_
+_See code: [packages/eas-cli/src/commands/build/dev.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/dev.ts)_

 ## `eas build:download`

@@ -521,7 +522,7 @@ DESCRIPTION
  download simulator/emulator builds for a given fingerprint hash
 ```

-_See code: [packages/eas-cli/src/commands/build/download.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/download.ts)_
+_See code: [packages/eas-cli/src/commands/build/download.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/download.ts)_

 ## `eas build:inspect`

@@ -559,7 +560,7 @@ DESCRIPTION
  inspect the state of the project at specific build stages, useful for troubleshooting
 ```

-_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -599,7 +600,7 @@ DESCRIPTION
  list all builds for your project
 ```

-_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/list.ts)_

 ## `eas build:resign`

@@ -629,7 +630,7 @@ DESCRIPTION
  re-sign a build archive
 ```

-_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/resign.ts)_

 ## `eas build:run`

@@ -655,7 +656,7 @@ DESCRIPTION
  run simulator/emulator builds from eas-cli
 ```

-_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/run.ts)_

 ## `eas build:submit`

@@ -707,7 +708,7 @@ DESCRIPTION
  get the latest version from EAS servers
 ```

-_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/version/get.ts)_

 ## `eas build:version:set`

@@ -725,7 +726,7 @@ DESCRIPTION
  update version of an app
 ```

-_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/version/set.ts)_

 ## `eas build:version:sync`

@@ -743,7 +744,7 @@ DESCRIPTION
  update a version in native code with a value stored on EAS servers
 ```

-_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

@@ -760,7 +761,7 @@ DESCRIPTION
  view a build for your project
 ```

-_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -781,7 +782,7 @@ DESCRIPTION
  create a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/create.ts)_

 ## `eas channel:delete [NAME]`

@@ -802,7 +803,7 @@ DESCRIPTION
  Delete a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/delete.ts)_
+_See code: [packages/eas-cli/src/commands/channel/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/delete.ts)_

 ## `eas channel:edit [NAME]`

@@ -824,7 +825,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

-_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -844,7 +845,7 @@ DESCRIPTION
  list all channels
 ```

-_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/list.ts)_

 ## `eas channel:pause [NAME]`

@@ -866,7 +867,7 @@ DESCRIPTION
  pause a channel to stop it from sending updates
 ```

-_See code: [packages/eas-cli/src/commands/channel/pause.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/pause.ts)_
+_See code: [packages/eas-cli/src/commands/channel/pause.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/pause.ts)_

 ## `eas channel:resume [NAME]`

@@ -888,7 +889,7 @@ DESCRIPTION
  resume a channel to start sending updates
 ```

-_See code: [packages/eas-cli/src/commands/channel/resume.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/resume.ts)_
+_See code: [packages/eas-cli/src/commands/channel/resume.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/resume.ts)_

 ## `eas channel:rollout [CHANNEL]`

@@ -923,7 +924,7 @@ DESCRIPTION
  Roll a new branch out on a channel incrementally.
 ```

-_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

@@ -946,7 +947,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/channel/view.ts)_

 ## `eas config`

@@ -967,7 +968,7 @@ DESCRIPTION
  display project configuration (app.json + eas.json)
 ```

-_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/config.ts)_

 ## `eas credentials`

@@ -984,7 +985,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/credentials/index.ts)_
+_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/credentials/index.ts)_

 ## `eas credentials:configure-build`

@@ -1002,7 +1003,7 @@ DESCRIPTION
  Set up credentials for building your project.
 ```

-_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/credentials/configure-build.ts)_
+_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/credentials/configure-build.ts)_

 ## `eas deploy [options]`

@@ -1031,7 +1032,7 @@ ALIASES
  $ eas worker:deploy
 ```

-_See code: [packages/eas-cli/src/commands/deploy/index.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/deploy/index.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/index.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/deploy/index.ts)_

 ## `eas deploy:alias`

@@ -1056,7 +1057,7 @@ ALIASES
  $ eas deploy:promote
 ```

-_See code: [packages/eas-cli/src/commands/deploy/alias/index.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/deploy/alias/index.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/alias/index.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/deploy/alias/index.ts)_

 ## `eas deploy:alias:delete [ALIAS_NAME]`

@@ -1077,7 +1078,7 @@ ALIASES
  $ eas worker:alias:delete
 ```

-_See code: [packages/eas-cli/src/commands/deploy/alias/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/deploy/alias/delete.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/alias/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/deploy/alias/delete.ts)_

 ## `eas deploy:delete [DEPLOYMENT_ID]`

@@ -1098,7 +1099,7 @@ ALIASES
  $ eas worker:delete
 ```

-_See code: [packages/eas-cli/src/commands/deploy/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/deploy/delete.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/deploy/delete.ts)_

 ## `eas deploy:promote`

@@ -1135,7 +1136,7 @@ DESCRIPTION
  register new Apple Devices to use for internal distribution
 ```

-_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -1155,7 +1156,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -1176,7 +1177,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/device/list.ts)_

 ## `eas device:rename`

@@ -1197,7 +1198,7 @@ DESCRIPTION
  rename a registered device
 ```

-_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/device/rename.ts)_

 ## `eas device:view [UDID]`

@@ -1211,7 +1212,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -1225,7 +1226,7 @@ DESCRIPTION
  display environment info
 ```

-_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/diagnostics.ts)_

 ## `eas env:create [ENVIRONMENT]`

@@ -1257,7 +1258,7 @@ DESCRIPTION
  create an environment variable for the current project or account
 ```

-_See code: [packages/eas-cli/src/commands/env/create.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/create.ts)_
+_See code: [packages/eas-cli/src/commands/env/create.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/create.ts)_

 ## `eas env:delete [ENVIRONMENT]`

@@ -1283,7 +1284,7 @@ DESCRIPTION
  delete an environment variable for the current project or account
 ```

-_See code: [packages/eas-cli/src/commands/env/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/delete.ts)_
+_See code: [packages/eas-cli/src/commands/env/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/delete.ts)_

 ## `eas env:exec ENVIRONMENT BASH_COMMAND`

@@ -1305,7 +1306,7 @@ DESCRIPTION
  execute a command with environment variables from the selected environment
 ```

-_See code: [packages/eas-cli/src/commands/env/exec.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/exec.ts)_
+_See code: [packages/eas-cli/src/commands/env/exec.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/exec.ts)_

 ## `eas env:get [ENVIRONMENT]`

@@ -1333,7 +1334,7 @@ DESCRIPTION
  view an environment variable for the current project or account
 ```

-_See code: [packages/eas-cli/src/commands/env/get.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/get.ts)_
+_See code: [packages/eas-cli/src/commands/env/get.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/get.ts)_

 ## `eas env:list [ENVIRONMENT]`

@@ -1361,7 +1362,7 @@ DESCRIPTION
  list environment variables for the current project or account
 ```

-_See code: [packages/eas-cli/src/commands/env/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/list.ts)_
+_See code: [packages/eas-cli/src/commands/env/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/list.ts)_

 ## `eas env:pull [ENVIRONMENT]`

@@ -1384,7 +1385,7 @@ DESCRIPTION
  pull environment variables for the selected environment to .env file
 ```

-_See code: [packages/eas-cli/src/commands/env/pull.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/pull.ts)_
+_See code: [packages/eas-cli/src/commands/env/pull.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/pull.ts)_

 ## `eas env:push [ENVIRONMENT]`

@@ -1406,7 +1407,7 @@ DESCRIPTION
  push environment variables from .env file to the selected environment
 ```

-_See code: [packages/eas-cli/src/commands/env/push.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/push.ts)_
+_See code: [packages/eas-cli/src/commands/env/push.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/push.ts)_

 ## `eas env:update [ENVIRONMENT]`

@@ -1440,7 +1441,7 @@ DESCRIPTION
  update an environment variable on the current project or account
 ```

-_See code: [packages/eas-cli/src/commands/env/update.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/env/update.ts)_
+_See code: [packages/eas-cli/src/commands/env/update.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/env/update.ts)_

 ## `eas fingerprint:compare [HASH1] [HASH2]`

@@ -1484,7 +1485,7 @@ EXAMPLES
  $ eas fingerprint:compare <FINGERPRINT-HASH> --update-id <UPDATE-ID> 	 # Compare fingerprint from update against provided fingerprint
 ```

-_See code: [packages/eas-cli/src/commands/fingerprint/compare.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/fingerprint/compare.ts)_
+_See code: [packages/eas-cli/src/commands/fingerprint/compare.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/fingerprint/compare.ts)_

 ## `eas fingerprint:generate`

@@ -1515,7 +1516,7 @@ EXAMPLES
  $ eas fingerprint:generate --json --non-interactive --platform android  	 # Output fingerprint json to stdout
 ```

-_See code: [packages/eas-cli/src/commands/fingerprint/generate.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/fingerprint/generate.ts)_
+_See code: [packages/eas-cli/src/commands/fingerprint/generate.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/fingerprint/generate.ts)_

 ## `eas help [COMMAND]`

@@ -1624,7 +1625,7 @@ DESCRIPTION
  validate the local store configuration
 ```

-_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/metadata/lint.ts)_

 ## `eas metadata:pull`

@@ -1641,7 +1642,7 @@ DESCRIPTION
  generate the local store configuration from the app stores
 ```

-_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -1658,7 +1659,7 @@ DESCRIPTION
  sync the local store configuration to the app stores
 ```

-_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/metadata/push.ts)_

 ## `eas new [PATH]`

@@ -1710,7 +1711,7 @@ DESCRIPTION
  open the project page in a web browser
 ```

-_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/open.ts)_
+_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/open.ts)_

 ## `eas project:info`

@@ -1724,7 +1725,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -1747,7 +1748,7 @@ ALIASES
  $ eas init
 ```

-_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/project/init.ts)_

 ## `eas project:new [PATH]`

@@ -1771,7 +1772,7 @@ ALIASES
  $ eas new
 ```

-_See code: [packages/eas-cli/src/commands/project/new.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/project/new.ts)_
+_See code: [packages/eas-cli/src/commands/project/new.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/project/new.ts)_

 ## `eas project:onboarding [TARGET_PROJECT_DIRECTORY]`

@@ -1789,7 +1790,7 @@ ALIASES
  $ eas onboarding
 ```

-_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/project/onboarding.ts)_
+_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/project/onboarding.ts)_

 ## `eas submit`

@@ -1822,7 +1823,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/submit.ts)_

 ## `eas update`

@@ -1865,7 +1866,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -1886,7 +1887,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1907,7 +1908,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:edit [GROUPID]`

@@ -1932,7 +1933,7 @@ DESCRIPTION
  edit all the updates in an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/edit.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/edit.ts)_
+_See code: [packages/eas-cli/src/commands/update/edit.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/edit.ts)_

 ## `eas update:list`

@@ -1959,7 +1960,7 @@ DESCRIPTION
  view the recent updates
 ```

-_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/list.ts)_

 ## `eas update:republish`

@@ -1997,7 +1998,7 @@ DESCRIPTION
  roll back to an existing update
 ```

-_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/republish.ts)_

 ## `eas update:revert-update-rollout`

@@ -2025,7 +2026,7 @@ DESCRIPTION
  revert a rollout update for a project
 ```

-_See code: [packages/eas-cli/src/commands/update/revert-update-rollout.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/revert-update-rollout.ts)_
+_See code: [packages/eas-cli/src/commands/update/revert-update-rollout.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/revert-update-rollout.ts)_

 ## `eas update:roll-back-to-embedded`

@@ -2055,7 +2056,7 @@ DESCRIPTION
  roll back to the embedded update
 ```

-_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_

 ## `eas update:rollback`

@@ -2076,7 +2077,7 @@ DESCRIPTION
  instead execute "eas update:republish" or "eas update:roll-back-to-embedded".
 ```

-_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/rollback.ts)_
+_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/rollback.ts)_

 ## `eas update:view GROUPID`

@@ -2096,7 +2097,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/update/view.ts)_

 ## `eas upload`

@@ -2117,7 +2118,7 @@ DESCRIPTION
  upload a local build and generate a sharable link
 ```

-_See code: [packages/eas-cli/src/commands/upload.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/upload.ts)_
+_See code: [packages/eas-cli/src/commands/upload.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/upload.ts)_

 ## `eas webhook:create`

@@ -2139,7 +2140,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -2159,7 +2160,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -2178,7 +2179,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -2201,7 +2202,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -2218,7 +2219,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -2339,7 +2340,7 @@ DESCRIPTION
  to cancel.
 ```

-_See code: [packages/eas-cli/src/commands/workflow/cancel.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/cancel.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/cancel.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/cancel.ts)_

 ## `eas workflow:create [NAME]`

@@ -2359,7 +2360,7 @@ DESCRIPTION
  create a new workflow configuration YAML file
 ```

-_See code: [packages/eas-cli/src/commands/workflow/create.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/create.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/create.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/create.ts)_

 ## `eas workflow:logs [ID]`

@@ -2383,7 +2384,7 @@ DESCRIPTION
  If no ID is passed in, you will be prompted to select from recent workflow runs for the current project.
 ```

-_See code: [packages/eas-cli/src/commands/workflow/logs.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/logs.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/logs.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/logs.ts)_

 ## `eas workflow:run FILE`

@@ -2423,7 +2424,7 @@ FLAG DESCRIPTIONS
    Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.
 ```

-_See code: [packages/eas-cli/src/commands/workflow/run.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/run.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/run.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/run.ts)_

 ## `eas workflow:runs`

@@ -2445,7 +2446,7 @@ DESCRIPTION
  list recent workflow runs for this project, with their IDs, statuses, and timestamps
 ```

-_See code: [packages/eas-cli/src/commands/workflow/runs.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/runs.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/runs.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/runs.ts)_

 ## `eas workflow:status [WORKFLOW_RUN_ID]`

@@ -2473,7 +2474,7 @@ FLAG DESCRIPTIONS
    Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.
 ```

-_See code: [packages/eas-cli/src/commands/workflow/status.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/status.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/status.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/status.ts)_

 ## `eas workflow:validate PATH`

@@ -2493,7 +2494,7 @@ DESCRIPTION
  validate a workflow configuration yaml file
 ```

-_See code: [packages/eas-cli/src/commands/workflow/validate.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/validate.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/validate.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/validate.ts)_

 ## `eas workflow:view [ID]`

@@ -2515,5 +2516,5 @@ DESCRIPTION
  workflow runs for the current project.
 ```

-_See code: [packages/eas-cli/src/commands/workflow/view.ts](https://github.com/expo/eas-cli/blob/v18.3.0/packages/eas-cli/src/commands/workflow/view.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/view.ts](https://github.com/expo/eas-cli/blob/v18.4.0/packages/eas-cli/src/commands/workflow/view.ts)_
 <!-- commandsstop -->
@@ -1,4 +1,12 @@
 /* eslint-disable no-console */
+
+// Simulate an interactive environment so that commands default to interactive mode in tests.
+// Without this, isNonInteractiveByDefault() returns true because:
+// 1. Jest runs in a non-TTY environment (!process.stdin.isTTY)
+// 2. CI environments set CI=1 (boolish('CI', false))
+Object.defineProperty(process.stdin, 'isTTY', { value: true, writable: true });
+delete process.env.CI;
+
 beforeAll(() => {
  console.log = jest.fn();
  console.warn = jest.fn();
@@ -1,6 +1,6 @@
 {
  "name": "eas-cli",
-  "version": "18.3.0",
+  "version": "18.4.0",
  "description": "EAS command line tool",
  "keywords": [
    "cli",
@@ -47,8 +47,8 @@
    "@expo/code-signing-certificates": "0.0.5",
    "@expo/config": "10.0.6",
    "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "18.2.0",
-    "@expo/eas-json": "18.2.0",
+    "@expo/eas-build-job": "18.4.0",
+    "@expo/eas-json": "18.4.0",
    "@expo/env": "^1.0.0",
    "@expo/json-file": "8.3.3",
    "@expo/logger": "18.0.1",
@@ -63,7 +63,7 @@
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "18.2.0",
+    "@expo/steps": "18.4.0",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "^4.8.3",
    "@oclif/plugin-autocomplete": "^3.2.40",
@@ -455,6 +455,9 @@ const queueProgressBar = new cliProgress.SingleBar(
  cliProgress.Presets.rect
 );

+let statusNewSetAt: number | null = null;
+const NEW_STATUS_GRACE_PERIOD_MS = 15_000;
+
 async function handleSingleBuildProgressAsync(
  {
    build,
@@ -486,11 +489,19 @@ async function handleSingleBuildProgressAsync(
    case BuildStatus.Finished:
      spinner.succeed('Build finished');
      return { refetch: false };
-    case BuildStatus.New:
-      spinner.text = `Build concurrency limit reached for your account. Build will enter queue once a concurrency becomes available. Add additional concurrencies at ${link(
-        formatAccountBillingUrl(accountName)
-      )}.`;
+    case BuildStatus.New: {
+      const now = Date.now();
+      statusNewSetAt ??= now;
+      const newStatusDurationMs = now - statusNewSetAt;
+      if (newStatusDurationMs < NEW_STATUS_GRACE_PERIOD_MS) {
+        spinner.text = 'Waiting for build to get enqueued…';
+      } else {
+        spinner.text = `Build concurrency limit reached for your account. Build will enter queue once a concurrency becomes available. Add additional concurrencies at ${link(
+          formatAccountBillingUrl(accountName)
+        )}.`;
+      }
      break;
+    }
    case BuildStatus.InQueue: {
      spinner.text = 'Build queued...';
      const progressBarPayload =
@@ -553,7 +564,7 @@ const priorityToQueueDisplayName: Record<BuildPriority, string> = {
 };

 const statusToDisplayName: Record<BuildStatus, string> = {
-  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
+  [BuildStatus.New]: 'waiting to enter the queue',
  [BuildStatus.InQueue]: 'in queue',
  [BuildStatus.InProgress]: 'in progress',
  [BuildStatus.PendingCancel]: 'canceled',
@@ -571,6 +582,7 @@ async function handleMultipleBuildsProgressAsync(
  const buildCount = maybeBuilds.length;
  const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);

+  const someNew = builds.some(build => build.status === BuildStatus.New);
  const allFinished =
    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
  const allSettled =
@@ -583,6 +595,10 @@ async function handleMultipleBuildsProgressAsync(
      ].includes(build.status)
    ).length === buildCount;

+  if (someNew && statusNewSetAt === null) {
+    statusNewSetAt = Date.now();
+  }
+
  if (allSettled) {
    if (allFinished) {
      spinner.succeed(formatSettledBuildsText(builds));
@@ -591,7 +607,11 @@ async function handleMultipleBuildsProgressAsync(
    }
    return { refetch: false };
  } else {
-    spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
+    const showConcurrencyWarning =
+      someNew &&
+      statusNewSetAt !== null &&
+      Date.now() - statusNewSetAt >= NEW_STATUS_GRACE_PERIOD_MS;
+    spinner.text = formatPendingBuildsText(originalSpinnerText, builds, showConcurrencyWarning);
    return { refetch: true };
  }
 }
@@ -610,12 +630,20 @@ function formatSettledBuildsText(builds: BuildFragment[]): string {
    .join('\n  ');
 }

-function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragment[]): string {
+function formatPendingBuildsText(
+  originalSpinnerText: string,
+  builds: BuildFragment[],
+  showConcurrencyWarning: boolean
+): string {
  return [
    originalSpinnerText,
    ...platforms.map(platform => {
      const build = builds.find(build => build.platform === platform);
      const status = build ? statusToDisplayName[build.status] : 'unknown';
+      const concurrencyWarning =
+        showConcurrencyWarning && build?.status === BuildStatus.New
+          ? ' (concurrency limit reached)'
+          : '';
      let extraInfo = '';
      if (
        build?.status === BuildStatus.InQueue &&
@@ -635,7 +663,7 @@ function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragm
      }
      return `${appPlatformEmojis[platform]} ${
        appPlatformDisplayNames[platform]
-      } build - status: ${chalk.bold(status)}${extraInfo}`;
+      } build - status: ${chalk.bold(status)}${concurrencyWarning}${extraInfo}`;
    }),
  ].join('\n  ');
 }
@@ -42,7 +42,7 @@ beforeEach(() => {
  jest.mocked(createAnalyticsAsync).mockResolvedValue(analytics);
 });

-const createTestEasCommand = () => {
+const createTestEasCommand = (): any => {
  class TestEasCommand extends EasCommand {
    override async runAsync(): Promise<void> {}
  }
@@ -1,4 +1,46 @@
-import { resolveNonInteractiveAndJsonFlags } from '../flags';
+import { isNonInteractiveByDefault, resolveNonInteractiveAndJsonFlags } from '../flags';
+
+describe(isNonInteractiveByDefault, () => {
+  const originalEnv = process.env;
+  const originalIsTTY = process.stdin.isTTY;
+
+  afterEach(() => {
+    process.env = originalEnv;
+    Object.defineProperty(process.stdin, 'isTTY', { value: originalIsTTY, writable: true });
+  });
+
+  test('returns false when stdin is a TTY and CI is not set', () => {
+    process.env = { ...originalEnv };
+    delete process.env.CI;
+    Object.defineProperty(process.stdin, 'isTTY', { value: true, writable: true });
+    expect(isNonInteractiveByDefault()).toBe(false);
+  });
+
+  test('returns true when CI=1', () => {
+    process.env = { ...originalEnv, CI: '1' };
+    Object.defineProperty(process.stdin, 'isTTY', { value: true, writable: true });
+    expect(isNonInteractiveByDefault()).toBe(true);
+  });
+
+  test('returns true when CI=true', () => {
+    process.env = { ...originalEnv, CI: 'true' };
+    Object.defineProperty(process.stdin, 'isTTY', { value: true, writable: true });
+    expect(isNonInteractiveByDefault()).toBe(true);
+  });
+
+  test('returns true when stdin is not a TTY', () => {
+    process.env = { ...originalEnv };
+    delete process.env.CI;
+    Object.defineProperty(process.stdin, 'isTTY', { value: undefined, writable: true });
+    expect(isNonInteractiveByDefault()).toBe(true);
+  });
+
+  test('returns true when both CI is set and stdin is not a TTY', () => {
+    process.env = { ...originalEnv, CI: '1' };
+    Object.defineProperty(process.stdin, 'isTTY', { value: undefined, writable: true });
+    expect(isNonInteractiveByDefault()).toBe(true);
+  });
+});

 describe(resolveNonInteractiveAndJsonFlags, () => {
  test('returns both false when no flags are set', () => {
@@ -1,4 +1,9 @@
 import { Flags } from '@oclif/core';
+import { boolish } from 'getenv';
+
+export function isNonInteractiveByDefault(): boolean {
+  return boolish('CI', false) || !process.stdin.isTTY;
+}

 export const EasNonInteractiveAndJsonFlags = {
  json: Flags.boolean({
@@ -7,6 +12,8 @@ export const EasNonInteractiveAndJsonFlags = {
  }),
  'non-interactive': Flags.boolean({
    description: 'Run the command in non-interactive mode.',
+    default: () => Promise.resolve(isNonInteractiveByDefault()),
+    noCacheDefault: true,
  }),
 };

@@ -64,6 +71,11 @@ export const EASEnvironmentVariableScopeFlag = {
 export const EASNonInteractiveFlag = {
  'non-interactive': Flags.boolean({
    description: 'Run the command in non-interactive mode.',
+    // eslint-disable-next-line async-protect/async-suffix
+    default: async () => {
+      return isNonInteractiveByDefault();
+    },
+    noCacheDefault: true,
  }),
 };

@@ -43,6 +43,10 @@ export default class BuildDev extends EasCommand {
      description: `Name of the build profile from eas.json. It must be a profile allowing to create emulator/simulator internal distribution dev client builds. The "${DEFAULT_EAS_BUILD_RUN_PROFILE_NAME}" build profile will be selected by default.`,
      helpValue: 'PROFILE_NAME',
    }),
+    'skip-build-if-not-found': Flags.boolean({
+      description: 'Skip build if no successful build with matching fingerprint is found.',
+      default: false,
+    }),
  };

  static override contextDefinition = {
@@ -128,10 +132,15 @@ export default class BuildDev extends EasCommand {
        await this.startDevServerAsync({ projectDir, platform });
        return;
      } else {
-        Log.warn('Artifacts for this build expired. New build will be started.');
+        Log.warn('Artifacts for this build expired.');
      }
    }

+    if (flags['skip-build-if-not-found']) {
+      Log.log('No successful build with matching fingerprint found. Skipping build.');
+      return;
+    }
+
    Log.log('🚀 No successful build with matching fingerprint found. Starting a new build...');

    const previousBuildsForSelectedProfile = await this.getBuildsAsync({
@@ -1,6 +1,6 @@
 {
  "name": "@expo/eas-json",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "description": "A library for interacting with eas.json",
  "homepage": "https://github.com/expo/eas-cli",
  "bugs": "https://github.com/expo/eas-cli/issues",
@@ -32,7 +32,7 @@
  },
  "dependencies": {
    "@babel/code-frame": "7.23.5",
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/eas-build-job": "18.4.0",
    "chalk": "4.1.2",
    "env-string": "1.0.1",
    "fs-extra": "11.2.0",
@@ -1,6 +1,6 @@
 {
  "name": "eas-cli-local-build-plugin",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "description": "Tool for running EAS compatible builds on a local machine.",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "BUSL-1.1",
@@ -26,8 +26,8 @@
    "clean": "rm -rf node_modules dist coverage *.tsbuildinfo"
  },
  "dependencies": {
-    "@expo/build-tools": "18.2.0",
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/build-tools": "18.4.0",
+    "@expo/eas-build-job": "18.4.0",
    "@expo/logger": "18.0.1",
    "@expo/spawn-async": "^1.7.2",
    "@expo/turtle-spawn": "18.0.1",
@@ -1,6 +1,6 @@
 {
  "name": "@expo/steps",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "BUSL-1.1",
  "author": "Expo <[email protected]>",
@@ -27,7 +27,7 @@
    "clean": "rm -rf node_modules dist coverage *.tsbuildinfo"
  },
  "dependencies": {
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/eas-build-job": "18.4.0",
    "@expo/logger": "18.0.1",
    "@expo/spawn-async": "^1.7.2",
    "arg": "^5.0.2",
@@ -3,6 +3,11 @@
    "name": "EAS Worker",
    "slug": "eas-worker",
    "platforms": ["ios"],
+    "ios": {
+      "infoPlist": {
+        "ITSAppUsesNonExemptEncryption": false
+      }
+    },
    "extra": {
      "eas": {
        "projectId": "90798684-1384-4ce4-a73b-9f3fa3e3e368"
@@ -1,6 +1,6 @@
 {
  "name": "@expo/worker",
-  "version": "18.2.0",
+  "version": "18.4.0",
  "private": true,
  "scripts": {
    "start": "yarn watch",
@@ -19,16 +19,16 @@
  },
  "dependencies": {
    "@babel/core": "7.24.7",
-    "@expo/build-tools": "18.2.0",
+    "@expo/build-tools": "18.4.0",
    "@expo/config-plugins": "8.0.8",
    "@expo/config-types": "52.0.1",
    "@expo/downloader": "18.0.1",
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/eas-build-job": "18.4.0",
    "@expo/logger": "18.0.1",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "18.2.0",
+    "@expo/steps": "18.4.0",
    "@expo/template-file": "18.0.1",
    "@expo/turtle-spawn": "18.0.1",
    "@hapi/boom": "10.0.1",
@@ -418,8 +418,7 @@ describe('State sync mechanism', () => {
    it('should expose tracking code as internal error code from generic job', async () => {
      jest.mocked(runGenericJobAsync).mockResolvedValueOnce({
        runResult: result(
-          new errors.BuildError('ASC app was not found for this account.', {
-            errorCode: genericJobRunErrorCode,
+          new errors.UserError(genericJobRunErrorCode, 'ASC app was not found for this account.', {
            trackingCode: 'GENERIC_TRACKING_ERROR',
          })
        ),
@@ -485,5 +484,75 @@ describe('State sync mechanism', () => {
      ws.close();
      clearTimeout(messageTimeout);
    });
+
+    it('should expose system errors with SERVER_ERROR and tracking code from generic job', async () => {
+      jest.mocked(runGenericJobAsync).mockResolvedValueOnce({
+        runResult: result(
+          new errors.SystemError('Internal service is unavailable.', {
+            trackingCode: 'GENERIC_SYSTEM_ERROR',
+          })
+        ),
+        buildWorkflow: {} as any,
+      });
+      const dispatchWS = new WebSocket(`ws://localhost:${port}?expo_vm_name=${hostname()}`);
+      const dispatchHelper = new WsHelper(dispatchWS);
+      await dispatchHelper.onOpen();
+      dispatchWS.send(
+        JSON.stringify({
+          type: 'dispatch',
+          buildId,
+          job: createTestGenericJob(),
+          initiatingUserId: '14367e1b-26fc-4c00-aedb-0629d78f8286',
+          metadata: {
+            trackingContext: {},
+          },
+        })
+      );
+      dispatchWS.close();
+      await dispatchHelper.onClose();
+
+      const ws = new WebSocket(`ws://localhost:${port}?expo_vm_name=${hostname()}`);
+      const helper = new WsHelper(ws);
+
+      let stateResponsePromiseResolve: () => void;
+      const stateResponsePromise = new Promise<void>(res => {
+        stateResponsePromiseResolve = res;
+      });
+      const onMessage = jest.fn((message: any) => {
+        clearTimeout(messageTimeout);
+        try {
+          expect(message).toBeTruthy();
+          expect(message.type).toBe('state-response');
+          expect(message.status).toBe('error');
+          expect(message.externalBuildError).toEqual({
+            errorCode: errors.ErrorCode.SERVER_ERROR,
+            message: 'Internal service is unavailable.',
+          });
+          expect(message.internalErrorCode).toBe('GENERIC_SYSTEM_ERROR');
+        } catch (err) {
+          throw err;
+        } finally {
+          stateResponsePromiseResolve();
+        }
+      });
+      const openPromise = helper.onOpen();
+      helper.onMessage(onMessage);
+
+      await openPromise;
+      messageTimeout = setTimeout(() => {
+        unreachableCode('state-response timeout');
+      }, 3000);
+
+      ws.send(JSON.stringify({ type: 'state-query', buildId }));
+
+      await stateResponsePromise;
+
+      expect(helper.onErrorCb).not.toHaveBeenCalled();
+      expect(helper.onOpenCb).toHaveBeenCalled();
+      expect(helper.onMessageCb).toHaveBeenCalled();
+      expect(helper.onCloseCb).not.toHaveBeenCalled();
+      ws.close();
+      clearTimeout(messageTimeout);
+    });
  });
 });
@@ -4,6 +4,47 @@ import { Response } from 'node-fetch';
 import fetch from 'node-fetch';
 import z from 'zod';

+jest.mock('@expo/build-tools', () => {
+  const actual = jest.requireActual('@expo/build-tools');
+  const { Writable } = jest.requireActual('node:stream');
+
+  class MockGCSLoggerStream extends Writable {
+    public static readonly CompressionMethod = actual.GCSLoggerStream.CompressionMethod;
+    public static readonly instances: MockGCSLoggerStream[] = [];
+
+    public readonly writes: any[] = [];
+
+    constructor(...args: any[]) {
+      super({ objectMode: true });
+      void args;
+      MockGCSLoggerStream.instances.push(this);
+    }
+
+    public async init(): Promise<string> {
+      return 'https://gcs.expo.test/logs';
+    }
+
+    public async cleanUp(): Promise<void> {}
+
+    public _write(
+      chunk: unknown,
+      _encoding: BufferEncoding,
+      callback: (error?: Error | null) => void
+    ): void {
+      this.writes.push(chunk);
+      callback(null);
+    }
+  }
+
+  return {
+    ...actual,
+    GCS: {
+      uploadWithSignedUrl: jest.fn(),
+    },
+    GCSLoggerStream: MockGCSLoggerStream,
+  };
+});
+
 import config from '../config';
 import { createBuildLoggerWithSecretsFilter } from '../logger';

@@ -24,19 +65,29 @@ async function waitForStreamFlush(): Promise<void> {
 }

 const fetchMock = jest.mocked(fetch);
+const { GCSLoggerStream } = jest.requireMock('@expo/build-tools') as {
+  GCSLoggerStream: {
+    instances: Array<{
+      writes: any[];
+    }>;
+  };
+};

 describe('logger', () => {
  const originalHttpBaseUrl = config.loggers.http.baseUrl;
  const originalBuildId = config.buildId;
+  const originalGcsSignedUploadUrlForLogs = config.loggers.gcs.signedUploadUrlForLogs;

  beforeEach(() => {
    fetchMock.mockReset();
    fetchMock.mockResolvedValue(new Response('', { status: 200, statusText: 'OK' }));
+    GCSLoggerStream.instances.length = 0;
  });

  afterEach(() => {
    config.loggers.http.baseUrl = originalHttpBaseUrl;
    config.buildId = originalBuildId;
+    config.loggers.gcs.signedUploadUrlForLogs = originalGcsSignedUploadUrlForLogs;
  });

  it('obfuscates secrets in logs', async () => {
@@ -227,6 +278,38 @@ describe('logger', () => {
    expect(secondAttemptOriginalLog).toEqual(firstAttemptOriginalLog);
  });

+  it('does not forward HTTP upload failures to the GCS build log stream', async () => {
+    config.loggers.http.baseUrl = 'https://logs.expo.test/logs/';
+    config.loggers.gcs.signedUploadUrlForLogs = {
+      url: 'https://gcs.expo.test/logs',
+      headers: {},
+    };
+    config.buildId = 'build-id';
+    fetchMock.mockResolvedValue(
+      new Response('upload failed', { status: 500, statusText: 'Internal Server Error' })
+    );
+
+    const { logger, cleanUp } = await createBuildLoggerWithSecretsFilter({
+      robotAccessToken: 'robot-token',
+    });
+
+    logger.info('Actual build log');
+    await cleanUp();
+
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    expect(GCSLoggerStream.instances).toHaveLength(1);
+
+    const gcsLogs = GCSLoggerStream.instances[0].writes;
+    expect(gcsLogs).toEqual(
+      expect.arrayContaining([expect.objectContaining({ msg: 'Actual build log' })])
+    );
+    expect(gcsLogs).not.toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ msg: 'Failed to send logs batch over HTTP' }),
+      ])
+    );
+  });
+
  it('drains transformed logs even without explicit output consumer', async () => {
    const { logger, outputStream } = await createBuildLoggerWithSecretsFilter({});

@@ -101,7 +101,7 @@ function logBuildError(logger: bunyan, analytics: Analytics, err: Error): void {
  const l = logger.child({ phase: BuildPhase.FAIL_BUILD });
  l.info({ marker: LogMarker.START_PHASE }, `Start phase: ${BuildPhase.FAIL_BUILD}`);

-  if (err instanceof errors.BuildError) {
+  if (err instanceof errors.ExpoError) {
    const internalErrorCode = err.trackingCode ?? err.errorCode;
    analytics.logEvent(Event.WORKER_BUILD_FAIL, {
      reason: err?.message,
@@ -45,7 +45,12 @@ export default {
      }),
    },
    http: {
-      baseUrl: process.env.ENVIRONMENT === 'development' ? 'http://localhost:4999/logs/' : null,
+      baseUrl:
+        process.env.ENVIRONMENT === 'development'
+          ? 'http://localhost:4999/logs/'
+          : process.env.ENVIRONMENT === 'staging'
+            ? 'https://staging-logs.expo.dev/logs/'
+            : null,
    },
  },
  buildCache: {
@@ -1,7 +1,6 @@
 import { bunyan } from '@expo/logger';
 import * as sentry from '@sentry/node';
 import Flatted from 'flatted';
-import { ZodError } from 'zod';

 import { boomify } from '../utils/boom';

@@ -34,20 +33,13 @@ class Sentry {
    const l = options.logger ?? this.logger;
    const tags = { ...this.options.tags, ...options.tags };
    const extras = options.extras ?? {};
-
-    // TurtleErrors don't need the explanatory ${msg} prefix,
-    // because their message should already be user-facing.
-    // ZodError#message can't be modified, so we don't reassign either.
-    if (err instanceof Error && !(err instanceof ZodError)) {
-      err.message = `${msg}\n${err.message}`;
-    }
-
    const boom = err instanceof Error ? boomify(err) : err;
    l.error({ tags, extras, err: boom }, msg);

    sentry.withScope((scope: sentry.Scope) => {
      scope.setTags(tags);
      scope.setExtras(extras);
+      scope.setExtra('message', msg);
      if (options?.level) {
        scope.setLevel(options?.level);
      }
@@ -152,7 +152,7 @@ export async function createBuildLoggerWithSecretsFilter(secrets: Job['secrets']
      headers: {
        Authorization: `Bearer ${secrets.robotAccessToken}`,
      },
-      logger: buildLogger,
+      logger: defaultLogger,
      bufferRetentionMs: config.loggers.gcs.signedUploadUrlForLogs
        ? Math.max(30_000, config.loggers.gcs.uploadIntervalMs * 2)
        : null,
@@ -109,13 +109,13 @@ export default class BuildService {
    this.startBuildInternal({ job, metadata, initiatingUserId, projectId });
  }

-  public async finishError(err: errors.BuildError, artifacts: Artifacts | null): Promise<void> {
+  public async finishError(err: errors.ExpoError, artifacts: Artifacts | null): Promise<void> {
    logger.error({ err }, 'Job finished with error');

    this.state.finish(Worker.Status.ERROR, {
      applicationArchiveName: artifacts?.APPLICATION_ARCHIVE ?? null,
      buildArtifactsName: artifacts?.BUILD_ARTIFACTS ?? null,
-      userError: err,
+      expoError: err,
    });
    const isSocketClosed: boolean = !this.ws;
    // wait 5 seconds to make sure all logs are flushed
@@ -127,7 +127,7 @@ export default class BuildService {
        type: WorkerMessage.MessageType.ERROR,
        applicationArchiveName: artifacts?.APPLICATION_ARCHIVE ?? null,
        buildArtifactsName: artifacts?.BUILD_ARTIFACTS ?? null,
-        externalBuildError: err.format(),
+        externalBuildError: err.toExternalExpoError(),
        internalErrorCode: err.trackingCode ?? err.errorCode,
      });
    }
@@ -308,31 +308,36 @@ export default class BuildService {
      await this.finishSuccess(artifacts);
    } catch (error: any) {
      const maybeArtifacts = (error.artifacts as Artifacts | undefined) ?? null;
-      const err = toBuildError(error, job);
-      const maybeRawError = error instanceof errors.BuildError ? (error.cause ?? error) : error;
-      const internalErrorCode = err.trackingCode ?? err.errorCode;
+      const err =
+        error instanceof errors.ExpoError
+          ? error
+          : 'mode' in job && [BuildMode.CUSTOM, BuildMode.REPACK].includes(job.mode)
+            ? new errors.UnknownCustomBuildError()
+            : new errors.UnknownBuildError();
+      const maybeRawError =
+        error instanceof errors.ExpoError && error.cause instanceof Error ? error.cause : error;

      sentry.handleError(err.message, maybeRawError, {
        tags: {
          ...(err.buildPhase ? { buildPhase: err.buildPhase } : {}),
-          errorCode: internalErrorCode,
+          errorCode: err.trackingCode ?? err.errorCode,
          ...('type' in job ? { workflow: job.type } : {}),
        },
        extras: {
          buildId: this.buildId,
          ...(err.metadata ? { errorMetadata: err.metadata } : {}),
-          ...(maybeRawError.stdout ? { stdout: getLastNLines(100, maybeRawError.stdout) } : {}),
-          ...(maybeRawError.stderr ? { stderr: getLastNLines(100, maybeRawError.stderr) } : {}),
+          ...(maybeRawError?.stdout ? { stdout: getLastNLines(100, maybeRawError.stdout) } : {}),
+          ...(maybeRawError?.stderr ? { stderr: getLastNLines(100, maybeRawError.stderr) } : {}),
        },
      });

      const robotAccessToken = job.secrets?.robotAccessToken;
      if (robotAccessToken && err.errorCode === errors.ErrorCode.UNKNOWN_ERROR) {
        let rawErrorMessage: string = '';
-        if (maybeRawError.stderr) {
+        if (maybeRawError?.stderr) {
          rawErrorMessage += '\n' + getLastNLines(100, maybeRawError.stderr);
        }
-        if (maybeRawError.stdout) {
+        if (maybeRawError?.stdout) {
          rawErrorMessage += '\n' + getLastNLines(100, maybeRawError.stdout);
        }

@@ -369,25 +374,6 @@ export default class BuildService {
  }
 }

-function toBuildError(error: unknown, job: Job): errors.BuildError {
-  if (error instanceof errors.BuildError) {
-    return error;
-  }
-
-  if (error instanceof errors.UserError) {
-    return new errors.BuildError(error.message, {
-      errorCode: error.errorCode,
-      docsUrl: error.docsUrl,
-      cause: error.cause ?? error,
-      metadata: error.metadata,
-    });
-  }
-
-  return 'mode' in job && [BuildMode.CUSTOM, BuildMode.REPACK].includes(job.mode)
-    ? new errors.UnknownCustomBuildError()
-    : new errors.UnknownBuildError();
-}
-
 function getLastNLines(numberOfLines: number, stream: string): string {
  const lines = stream.split('\n');
  if (lines.length <= numberOfLines) {
@@ -8,7 +8,7 @@ class State {
  private status: Worker.Status = Worker.Status.NEW;
  private applicationArchiveName: string | null = null;
  private buildArtifactsName: string | null = null;
-  private userError?: errors.BuildError;
+  private expoError?: errors.ExpoError;
  private abortReason?: LauncherMessage.AbortReason;
  private readonly shouldCloseWorker = false;

@@ -25,17 +25,17 @@ class State {
    {
      applicationArchiveName,
      buildArtifactsName,
-      userError,
+      expoError,
    }: {
      applicationArchiveName: string | null;
      buildArtifactsName: string | null;
-      userError?: errors.BuildError;
+      expoError?: errors.ExpoError;
    }
  ): void {
    this.status = result;
    this.applicationArchiveName = applicationArchiveName;
    this.buildArtifactsName = buildArtifactsName;
-    this.userError = userError;
+    this.expoError = expoError;
  }

  public setAbortReason(reason: LauncherMessage.AbortReason): void {
@@ -48,9 +48,9 @@ class State {
      status: this.status,
      buildArtifactsName: this.buildArtifactsName ?? null,
      applicationArchiveName: this.applicationArchiveName ?? null,
-      ...(this.userError && {
-        externalBuildError: this.userError.format(),
-        internalErrorCode: this.userError.trackingCode ?? this.userError.errorCode,
+      ...(this.expoError && {
+        externalBuildError: this.expoError.toExternalExpoError(),
+        internalErrorCode: this.expoError.trackingCode ?? this.expoError.errorCode,
      }),
      abortReason: this.abortReason,
    };
@@ -21,7 +21,7 @@ export default class HttpLogStream extends Writable {
  private readonly buffer: BufferedLogEntry[] = [];
  private readonly url: string;
  private readonly headers: Record<string, string>;
-  private readonly logger?: bunyan;
+  private readonly logger: bunyan;
  private readonly maxBatchBytes: number;
  private readonly bufferRetentionMs: number | null;
  private inFlightRequest: Promise<void> | null = null;
@@ -98,7 +98,7 @@ export default class HttpLogStream extends Writable {
        if (!isCleanup) {
          // Keep logs in memory if upload fails so a later flush can retry.
          this.buffer.unshift(...batch);
-          this.logger?.error({ err }, 'Failed to send logs batch over HTTP');
+          this.logger.error({ err }, 'Failed to send logs batch over HTTP');
        }
      })
      .finally(() => {
@@ -2700,14 +2700,14 @@ __metadata:
  languageName: node
  linkType: hard

-"@expo/build-tools@npm:18.2.0, @expo/build-tools@workspace:packages/build-tools":
+"@expo/build-tools@npm:18.4.0, @expo/build-tools@workspace:packages/build-tools":
  version: 0.0.0-use.local
  resolution: "@expo/build-tools@workspace:packages/build-tools"
  dependencies:
    "@expo/config": "npm:10.0.6"
    "@expo/config-plugins": "npm:9.0.12"
    "@expo/downloader": "npm:18.0.1"
-    "@expo/eas-build-job": "npm:18.2.0"
+    "@expo/eas-build-job": "npm:18.4.0"
    "@expo/env": "npm:^0.4.0"
    "@expo/logger": "npm:18.0.1"
    "@expo/package-manager": "npm:1.9.10"
@@ -2715,7 +2715,7 @@ __metadata:
    "@expo/repack-app": "npm:~0.2.5"
    "@expo/results": "npm:^1.0.0"
    "@expo/spawn-async": "npm:1.7.2"
-    "@expo/steps": "npm:18.2.0"
+    "@expo/steps": "npm:18.4.0"
    "@expo/template-file": "npm:18.0.1"
    "@expo/turtle-spawn": "npm:18.0.1"
    "@expo/xcpretty": "npm:^4.3.1"
@@ -2986,7 +2986,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@expo/eas-build-job@npm:18.2.0, @expo/eas-build-job@workspace:packages/eas-build-job":
+"@expo/eas-build-job@npm:18.4.0, @expo/eas-build-job@workspace:packages/eas-build-job":
  version: 0.0.0-use.local
  resolution: "@expo/eas-build-job@workspace:packages/eas-build-job"
  dependencies:
@@ -3002,12 +3002,12 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@expo/eas-json@npm:18.2.0, @expo/eas-json@workspace:packages/eas-json":
+"@expo/eas-json@npm:18.4.0, @expo/eas-json@workspace:packages/eas-json":
  version: 0.0.0-use.local
  resolution: "@expo/eas-json@workspace:packages/eas-json"
  dependencies:
    "@babel/code-frame": "npm:7.23.5"
-    "@expo/eas-build-job": "npm:18.2.0"
+    "@expo/eas-build-job": "npm:18.4.0"
    "@tsconfig/node20": "npm:20.1.8"
    "@types/babel__code-frame": "npm:7.0.3"
    "@types/fs-extra": "npm:11.0.4"
@@ -3328,11 +3328,11 @@ __metadata:
  languageName: node
  linkType: hard

-"@expo/steps@npm:18.2.0, @expo/steps@workspace:packages/steps":
+"@expo/steps@npm:18.4.0, @expo/steps@workspace:packages/steps":
  version: 0.0.0-use.local
  resolution: "@expo/steps@workspace:packages/steps"
  dependencies:
-    "@expo/eas-build-job": "npm:18.2.0"
+    "@expo/eas-build-job": "npm:18.4.0"
    "@expo/logger": "npm:18.0.1"
    "@expo/spawn-async": "npm:^1.7.2"
    "@jest/globals": "npm:^29.7.0"
@@ -3398,16 +3398,16 @@ __metadata:
  resolution: "@expo/worker@workspace:packages/worker"
  dependencies:
    "@babel/core": "npm:7.24.7"
-    "@expo/build-tools": "npm:18.2.0"
+    "@expo/build-tools": "npm:18.4.0"
    "@expo/config-plugins": "npm:8.0.8"
    "@expo/config-types": "npm:52.0.1"
    "@expo/downloader": "npm:18.0.1"
-    "@expo/eas-build-job": "npm:18.2.0"
+    "@expo/eas-build-job": "npm:18.4.0"
    "@expo/logger": "npm:18.0.1"
    "@expo/results": "npm:1.0.0"
    "@expo/rudder-sdk-node": "npm:1.1.1"
    "@expo/spawn-async": "npm:1.7.2"
-    "@expo/steps": "npm:18.2.0"
+    "@expo/steps": "npm:18.4.0"
    "@expo/template-file": "npm:18.0.1"
    "@expo/turtle-spawn": "npm:18.0.1"
    "@hapi/boom": "npm:10.0.1"
@@ -10164,7 +10164,7 @@ __metadata:
  resolution: "create-eas-build-function@workspace:packages/create-eas-build-function"
  dependencies:
    "@expo/package-manager": "npm:1.9.10"
-    "@expo/steps": "npm:18.2.0"
+    "@expo/steps": "npm:18.4.0"
    "@jest/globals": "npm:^29.7.0"
    "@types/jest": "npm:^29.5.12"
    "@types/node": "npm:20.14.2"
@@ -10777,8 +10777,8 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "eas-cli-local-build-plugin@workspace:packages/local-build-plugin"
  dependencies:
-    "@expo/build-tools": "npm:18.2.0"
-    "@expo/eas-build-job": "npm:18.2.0"
+    "@expo/build-tools": "npm:18.4.0"
+    "@expo/eas-build-job": "npm:18.4.0"
    "@expo/logger": "npm:18.0.1"
    "@expo/spawn-async": "npm:^1.7.2"
    "@expo/turtle-spawn": "npm:18.0.1"
@@ -10833,8 +10833,8 @@ __metadata:
    "@expo/code-signing-certificates": "npm:0.0.5"
    "@expo/config": "npm:10.0.6"
    "@expo/config-plugins": "npm:9.0.12"
-    "@expo/eas-build-job": "npm:18.2.0"
-    "@expo/eas-json": "npm:18.2.0"
+    "@expo/eas-build-job": "npm:18.4.0"
+    "@expo/eas-json": "npm:18.4.0"
    "@expo/env": "npm:^1.0.0"
    "@expo/json-file": "npm:8.3.3"
    "@expo/logger": "npm:18.0.1"
@@ -10849,7 +10849,7 @@ __metadata:
    "@expo/results": "npm:1.0.0"
    "@expo/rudder-sdk-node": "npm:1.1.1"
    "@expo/spawn-async": "npm:1.7.2"
-    "@expo/steps": "npm:18.2.0"
+    "@expo/steps": "npm:18.4.0"
    "@expo/timeago.js": "npm:1.0.0"
    "@graphql-codegen/cli": "npm:5.0.0"
    "@graphql-codegen/introspection": "npm:4.0.0"
Author	SHA1	Message	Date
Expo CI	4e202db843	v18.4.0	2026-03-16 20:21:54 +00:00
Stanisław Chmiela	ab209463ab	[worker] Prevent forwarding HTTP log failures to GCS logstream (#3507 ) Makes sure we don't log "Failed to upload batch of logs" to user-facing log as we did [here](https://staging.expo.dev/accounts/expo-services/projects/worker-system-tests/workflows/019cf7b3-19d6-7b57-bb6f-41d5c63491e3).	2026-03-16 19:02:25 +01:00
Stanisław Chmiela	99e9d367a1	[worker] Add `ITSAppUsesNonExemptEncryption` flag to worker app config (#3506 ) Summary - add the missing `ITSAppUsesNonExemptEncryption` boolean to `packages/worker/app.json` so the worker app can declare non-exempt encryption usage and avoid iOS config errors Should fix system tests!	2026-03-16 18:23:50 +01:00
Stanisław Chmiela	a6f68462c9	Enable staging HTTP log streaming (#3505 ) ## Summary - enable worker HTTP log streaming for staging using https://staging-logs.expo.dev/logs/ This is not tied to anything in UI yet. Just want to see the logs flowing.	2026-03-16 16:41:07 +01:00
Szymon ŚwierkandStanisław Chmiela	1c58823991	[eas cli] Builds: wait before showing the concurrency limit message (#3493 ) * [eas cli] builds: wait before showing the concurrency limit message * Update packages/eas-cli/src/build/build.ts Co-authored-by: Stanisław Chmiela <[email protected]> * apply style/naming CR suggestions * remove the unnecessarily defensive clean-ups --------- Co-authored-by: Stanisław Chmiela <[email protected]>	2026-03-16 15:11:46 +01:00
Ash Wu	6a804ab8d7	[build-tools] Store per-attempt results for Maestro test retries (#3498 ) Signed-off-by: Ash Wu <[email protected]>	2026-03-16 21:01:42 +08:00
Stanisław Chmiela	74eff9bf67	[worker] Stop mutating errors in Sentry reporting (#3502 ) ## Summary - stop mutating the original error instance in worker Sentry reporting - attach the worker message to Sentry as an extra instead of rewriting the exception message — matches `universe/server-logging` - keep the launcher-facing error payload unchanged - fixes integration tests ## Testing - yarn test:integration:watch stateSync - yarn test:unit sentry	2026-03-13 12:42:54 +01:00
Stanisław Chmiela	d20c465ddf	[eas-build-job] Introduce `SystemError` and replace `BuildError` (#3471 ) ## Summary - introduce `SystemError` as the explicit system-failure type - replace in-repo `BuildError` usage with `ExpoError`, `UserError`, and `SystemError` - keep unknown errors on the user-error side ## Changes - remove the old `BuildError` class from the in-repo error flow - make `SystemError` always publish `SERVER_ERROR` while keeping `trackingCode` for internal use - update worker handling, analytics, and state sync to use the shared `ExpoError` contract - avoid mutating the user-facing error object during Sentry reporting ## Testing - `packages/eas-build-job`: `npm exec -- corepack yarn build && npm exec -- corepack yarn test src/__tests__/errors.test.ts --runInBand` - `packages/build-tools`: `npm exec -- corepack yarn jest-unit src/buildErrors/__tests__/detectError.test.ts --runInBand` - `packages/worker`: `npm exec -- corepack yarn test:integration src/__integration__/stateSync.test.ts`	2026-03-13 09:20:09 +01:00
Evan Bacon	0c17846e67	Auto-detect non-interactive mode in CI / non-TTY environments (#3486 ) # Why `eas build -p android` prompts for keystore generation and fails in CI or non-TTY environments: ``` Input is required, but stdin is not readable. Failed to display prompt: Generate a new Android Keystore? ``` Passing `--non-interactive` works around this, but it should be auto-detected when `CI=1` or stdin is not a TTY. # How Set a `default` function on both `--non-interactive` flag definitions (`EasNonInteractiveAndJsonFlags` and `EASNonInteractiveFlag`) in `packages/eas-cli/src/commandUtils/flags.ts`. The default checks `CI` env var (via `boolish` from `getenv`) and `process.stdin.isTTY`. - oclif evaluates `default` only when the user does NOT pass `--non-interactive` on CLI - `noCacheDefault: true` prevents baking the developer's environment into `oclif.manifest.json` - All ~60 commands using these flag definitions automatically get CI/TTY auto-detection with no other changes needed # Test Plan - Added 5 unit tests for `isNonInteractiveByDefault()` covering: TTY without CI (false), CI=1 (true), CI=true (true), non-TTY stdin (true), both CI and non-TTY (true) - All existing `resolveNonInteractiveAndJsonFlags` tests pass unchanged - `yarn typecheck` passes - `yarn lint` passes (0 errors) ``` PASS src/commandUtils/__tests__/flags-test.ts isNonInteractiveByDefault ✓ returns false when stdin is a TTY and CI is not set ✓ returns true when CI=1 ✓ returns true when CI=true ✓ returns true when stdin is not a TTY ✓ returns true when both CI is set and stdin is not a TTY resolveNonInteractiveAndJsonFlags ✓ returns both false when no flags are set ✓ --json implies --non-interactive ✓ --non-interactive alone does not enable json ✓ both flags explicitly set ✓ both flags explicitly false ✓ --json false with --non-interactive true Test Suites: 1 passed, 1 total Tests: 11 passed, 11 total ``` 🤖 Generated with [Claude Code](https://claude.com/claude-code)	2026-03-12 12:29:04 -07:00
Douglas Lowder	d5a3fc06f9	Enable manual testing of changelog GitHub workflow (#3500 ) # Why There have been failures recently with the GitHub CHANGELOG check. Adjusting the workflow so that it can be manually tested. # How Add `workflow_dispatch:` # Test Plan CI should pass	2026-03-12 10:57:58 -07:00
Matheus MichelsandDouglas Lowder	c51ac27e25	[eas-cli] add skip-build-if-not-found option to eas build:dev (#3495 ) * add skip-build-if-not-found to build:dev * add changelog entry for build:dev skip flag * Remove duplicate line in CHANGELOG * Adjust CHANGELOG * Bump add-pr-comment workflow dep --------- Co-authored-by: Douglas Lowder <[email protected]>	2026-03-11 17:57:44 -07:00
Jacob KaplanandClaude Opus 4.6	88506d01a6	fix(build-tools): check all certificates in provisioning profile during verification (#3484 ) * [build-tools] Check all certificates in provisioning profile during verification Apple provisioning profiles can contain multiple developer certificates (e.g., when a team has multiple developers). The previous code only checked DeveloperCertificates[0], causing false "profile and distribution certificate don't match" errors when the signing certificate was at a different index. Co-Authored-By: Claude Opus 4.6 <[email protected]> * [build-tools] Add CHANGELOG entry for multi-cert provisioning profile fix Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>	2026-03-11 15:06:29 -07:00
Stanisław Chmiela	77e36e0743	[build-tools] Enforce `C.utf8` locale for Gradle invocations (#3494 ) # Why Some environments that run Gradle do not have `en_US.UTF-8` available, which can lead to locale warnings and Gradle failures when Java falls back to a non-UTF-8 default charset. In the affected environment, `locale -a` returned only: ```sh C C.utf8 POSIX ``` Setting `LC_ALL=C.UTF-8` fixed the Gradle issue. This matches the behavior described in [gradle/gradle#23391](https://github.com/gradle/gradle/issues/23391#issuecomment-1878979127), where Gradle/archive handling fails under a non-UTF-8 locale. # How Inline `LC_ALL: 'C.UTF-8'` at the two Android Gradle subprocess call sites in `@expo/build-tools`: - `packages/build-tools/src/android/gradle.ts` - `packages/build-tools/src/steps/utils/android/gradle.ts` This keeps the change narrowly scoped to Gradle execution instead of changing the broader worker environment or unrelated iOS/macOS build paths. # Test Plan - Verified the affected environment does not support `en_US.UTF-8`: ```sh locale -a ``` Output: ```sh C C.utf8 POSIX ``` - Confirmed that setting `LC_ALL=C.UTF-8` fixes the Gradle issue locally. - Ran a targeted TypeScript check after the code change: ```sh ./node_modules/.bin/tsc -p packages/build-tools/tsconfig.json --noEmit ```	2026-03-11 13:39:38 +01:00
Stanisław Chmiela	ce8f438610	[build-tools] Inject Android version without credentials (#3482 ) # Why The Android builder currently only injects Gradle config during `PREPARE_CREDENTIALS`. That means `job.version.versionCode` and `job.version.versionName` are ignored for builds that do not provide Android build credentials, even though those version values are present on the job. This ports the Android version injection change from `expo/eas-build#425`, now on top of the merged enum-backed `CONFIGURE_ANDROID_VERSION` build phase. # How - switch the Android builder from the legacy `eas-build.gradle` shim to the existing direct Gradle injection helpers - keep credential injection gated on build credentials - inject the Android version Gradle config whenever `job.version` includes `versionCode` or `versionName`, even if there are no credentials - run that injection in `BuildPhase.CONFIGURE_ANDROID_VERSION` - remove the now-unused legacy shim files - warn when deprecated `eas-build.gradle` still exists, matching the previous conservative behavior - add focused Android builder coverage for the no-credentials version case - add helper coverage for the legacy warning path # Test Plan - `mise exec -- yarn workspace @expo/build-tools jest-unit src/steps/utils/android/__tests__/gradleConfig.test.ts src/builders/__tests__/android.test.ts` - `mise exec -- yarn workspace @expo/build-tools test` - `mise exec -- yarn workspace @expo/build-tools typecheck` - `git diff --check`	2026-03-11 13:16:44 +01:00