Revert "[eas-cli] [ENG-9957] Don't overwrite distribution for simulat…

…or build…" This reverts commit 315b5b2.
expo · Jan 31, 2024 · c527fe1 · c527fe1
1 parent 315b5b2
commit c527fe1
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 274 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,8 +12,6 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
-- Add simulator flag to metadata. ([#2073](https://github.com/expo/eas-cli/pull/2073) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
 ## [7.1.2](https://github.com/expo/eas-cli/releases/tag/v7.1.2) - 2024-01-30
 
 ### 🧹 Chores

diff --git a/packages/eas-cli/graphql.schema.json b/packages/eas-cli/graphql.schema.json
diff --git a/packages/eas-cli/src/build/__tests__/cancel-test.ts b/packages/eas-cli/src/build/__tests__/cancel-test.ts
@@ -92,6 +92,5 @@ function createMockBuildFragment({
     },
     status: BuildStatus.InQueue,
     resourceClass: BuildResourceClass.AndroidMedium,
-    isForIosSimulator: false,
   };
 }
diff --git a/packages/eas-cli/src/build/__tests__/delete-test.ts b/packages/eas-cli/src/build/__tests__/delete-test.ts
@@ -92,6 +92,5 @@ function createMockBuildFragment({
     },
     status: BuildStatus.InQueue,
     resourceClass: BuildResourceClass.AndroidMedium,
-    isForIosSimulator: false,
   };
 }
diff --git a/packages/eas-cli/src/build/metadata.ts b/packages/eas-cli/src/build/metadata.ts
@@ -8,7 +8,6 @@ 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,
@@ -29,7 +28,10 @@ export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<Metadata> {
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
-  const distribution = ctx.buildProfile.distribution ?? BuildDistributionType.STORE;
+  const distribution =
+    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
+      ? 'simulator'
+      : ctx.buildProfile.distribution) ?? 'store';
   const metadata: Metadata = {
     trackingContext: ctx.analyticsEventProperties,
     ...(await maybeResolveVersionsAsync(ctx)),
@@ -68,7 +70,6 @@ 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);
 }

diff --git a/packages/eas-cli/src/build/types.ts b/packages/eas-cli/src/build/types.ts
@@ -11,6 +11,5 @@ export enum BuildStatus {
 export enum BuildDistributionType {
   STORE = 'store',
   INTERNAL = 'internal',
-  /** @deprecated Use simulator flag instead */
   SIMULATOR = 'simulator',
 }
diff --git a/packages/eas-cli/src/commands/build/list.ts b/packages/eas-cli/src/commands/build/list.ts
@@ -10,7 +10,6 @@ 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';
@@ -52,10 +51,6 @@ 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 = {
@@ -74,17 +69,6 @@ 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 },
@@ -116,7 +100,6 @@ export default class BuildList extends EasCommand {
         appIdentifier: flags.appIdentifier,
         buildProfile: flags.buildProfile,
         gitCommitHash: flags.gitCommitHash,
-        simulator: flags.simulator,
       },
       paginatedQueryOptions,
     });