[eas-cli] [ENG-9957] Don't overwrite distribution for simulator builds

packages/eas-cli/src/build/__tests__/cancel-test.ts

@@ -92,5 +92,6 @@ function createMockBuildFragment({
     },
     status: BuildStatus.InQueue,
     resourceClass: BuildResourceClass.AndroidMedium,
+    isForSimulator: false,
   };
 }

packages/eas-cli/src/build/__tests__/delete-test.ts

@@ -92,5 +92,6 @@ function createMockBuildFragment({
     },
     status: BuildStatus.InQueue,
     resourceClass: BuildResourceClass.AndroidMedium,
+    isForSimulator: false,
   };
 }

packages/eas-cli/src/build/metadata.ts

@@ -8,6 +8,7 @@ import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from '.
 import { BuildContext } from './context';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 import { LocalBuildMode } from './local';
+import { BuildDistributionType } from './types';
 import Log from '../log';
 import {
   getUsername,
@@ -28,10 +29,7 @@ export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<Metadata> {
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
-  const distribution =
-    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
-      ? 'simulator'
-      : ctx.buildProfile.distribution) ?? 'store';
+  const distribution = ctx.buildProfile.distribution ?? BuildDistributionType.STORE;
   const metadata: Metadata = {
     trackingContext: ctx.analyticsEventProperties,
     ...(await maybeResolveVersionsAsync(ctx)),
@@ -70,6 +68,7 @@ export async function collectMetadataAsync<T extends Platform>(
     requiredPackageManager: ctx.requiredPackageManager ?? undefined,
     selectedImage: ctx.buildProfile.image,
     customNodeVersion: ctx.buildProfile.node,
+    simulator: 'simulator' in ctx.buildProfile && ctx.buildProfile.simulator,
   };
   return sanitizeMetadata(metadata);
 }

packages/eas-cli/src/build/types.ts

@@ -11,5 +11,6 @@ export enum BuildStatus {
 export enum BuildDistributionType {
   STORE = 'store',
   INTERNAL = 'internal',
+  /** @deprecated Use simulator flag instead */
   SIMULATOR = 'simulator',
 }

packages/eas-cli/src/commands/build/list.ts

@@ -10,6 +10,7 @@ import {
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
 import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import Log from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { buildDistributionTypeToGraphQLDistributionType } from '../../utils/buildDistribution';
@@ -51,6 +52,10 @@ export default class BuildList extends EasCommand {
     ...EasPaginatedQueryFlags,
     limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
     ...EasNonInteractiveAndJsonFlags,
+    simulator: Flags.boolean({
+      description:
+        'Filter only iOS simulator builds. Can only be used with --platform flag set to "ios"',
+    }),
   };
 
   static override contextDefinition = {
@@ -69,6 +74,17 @@ export default class BuildList extends EasCommand {
       distribution: buildDistribution,
       'non-interactive': nonInteractive,
     } = flags;
+    if (buildDistribution === BuildDistributionType.SIMULATOR) {
+      Log.warn(
+        `Using --distribution flag with "simulator" value is deprecated - use --simulator flag instead`
+      );
+    }
+    if (flags.simulator && requestedPlatform !== RequestedPlatform.Ios) {
+      Log.error(
+        `The --simulator flag is only usable with --platform flag set to "ios", as it is used to filter specifically iOS simulator builds`
+      );
+      process.exit(1);
+    }
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -100,6 +116,7 @@ export default class BuildList extends EasCommand {
         appIdentifier: flags.appIdentifier,
         buildProfile: flags.buildProfile,
         gitCommitHash: flags.gitCommitHash,
+        simulator: flags.simulator,
       },
       paginatedQueryOptions,
     });

packages/eas-cli/src/commands/build/run.ts

@@ -11,7 +11,7 @@ import {
   PaginatedQueryOptions,
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
-import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
+import { AppPlatform, BuildFragment, BuildStatus } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -200,8 +200,7 @@ async function maybeGetBuildAsync(
   projectId: string,
   paginatedQueryOptions: PaginatedQueryOptions
 ): Promise<BuildFragment | null> {
-  const distributionType =
-    flags.selectedPlatform === AppPlatform.Ios ? DistributionType.Simulator : undefined;
+  const simulator = flags.selectedPlatform === AppPlatform.Ios ? true : undefined;
 
   if (flags.runArchiveFlags.id) {
     const build = await BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
@@ -219,9 +218,9 @@ async function maybeGetBuildAsync(
       } build to run for ${await getDisplayNameForProjectIdAsync(graphqlClient, projectId)} app`,
       filter: {
         platform: flags.selectedPlatform,
-        distribution: distributionType,
         status: BuildStatus.Finished,
         buildProfile: flags.profile,
+        simulator,
       },
       paginatedQueryOptions,
       selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
@@ -235,9 +234,9 @@ async function maybeGetBuildAsync(
       projectId,
       filter: {
         platform: flags.selectedPlatform,
-        distribution: distributionType,
         status: BuildStatus.Finished,
         buildProfile: flags.profile,
+        simulator,
       },
     });