[eas-cli] [ENG-10146] Allow submission of builds in progress

CHANGELOG.md

@@ -13,6 +13,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add `worker --alias` flag to assign custom aliases when deploying. ([#2551](https://github.com/expo/eas-cli/pull/2551) by [@byCedric](https://github.com/byCedric)))
 - Add `worker --id` flag to use a custom deployment identifier. ([#2552](https://github.com/expo/eas-cli/pull/2552) by [@byCedric](https://github.com/byCedric)))
 - Add `worker --environment` flag to deploy with EAS environment variables. ([#2557](https://github.com/expo/eas-cli/pull/2557) by [@kitten](https://github.com/kitten)))
+- Allow submitting builds in progress ([#2543](https://github.com/expo/eas-cli/pull/2543) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
 
 ### 🐛 Bug fixes
 

packages/eas-cli/src/submit/ArchiveSource.ts

@@ -7,7 +7,7 @@ import * as uuid from 'uuid';
 import { getRecentBuildsForSubmissionAsync } from './utils/builds';
 import { isExistingFileAsync, uploadAppArchiveAsync } from './utils/files';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { BuildFragment } from '../graphql/generated';
+import { BuildFragment, BuildStatus } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log, { learnMore } from '../log';
@@ -89,6 +89,16 @@ export type ArchiveSource =
 
 export type ResolvedArchiveSource = ArchiveUrlSource | ArchiveGCSSource | ArchiveBuildSource;
 
+const buildStatusMapping: Record<BuildStatus, string> = {
+  [BuildStatus.New]: 'new',
+  [BuildStatus.InQueue]: 'in queue',
+  [BuildStatus.InProgress]: 'in progress',
+  [BuildStatus.Finished]: 'finished',
+  [BuildStatus.Errored]: 'errored',
+  [BuildStatus.PendingCancel]: 'canceled',
+  [BuildStatus.Canceled]: 'canceled',
+};
+
 export async function getArchiveAsync(
   ctx: ArchiveResolverContext,
   source: ArchiveSource
@@ -344,6 +354,7 @@ function formatBuildChoice(build: BuildFragment): prompts.Choice {
     gitCommitMessage,
     channel,
     message,
+    status,
   } = build;
   const buildDate = new Date(updatedAt);
 
@@ -368,6 +379,7 @@ function formatBuildChoice(build: BuildFragment): prompts.Choice {
         ? chalk.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
         : null,
     },
+    { name: 'Status', value: buildStatusMapping[status] },
   ];
 
   const filteredDescriptionArray: string[] = descriptionItems

packages/eas-cli/src/submit/__tests__/ArchiveSource-test.ts

@@ -7,6 +7,7 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import {
   AppPlatform,
   BuildFragment,
+  BuildStatus,
   SubmissionArchiveSourceType,
   UploadSessionType,
 } from '../../graphql/generated';
@@ -41,6 +42,17 @@ const MOCK_BUILD_FRAGMENT: Partial<BuildFragment> = {
   appVersion: '1.2.3',
   platform: AppPlatform.Android,
   updatedAt: Date.now(),
+  status: BuildStatus.Finished,
+};
+const MOCK_IN_PROGRESS_BUILD_FRAGMENT: Partial<BuildFragment> = {
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  status: BuildStatus.InProgress,
 };
 
 const SOURCE_STUB_INPUT = {
@@ -246,7 +258,7 @@ describe(getArchiveAsync, () => {
     expect(archive.sourceType).toBe(ArchiveSourceType.url);
   });
 
-  it('handles build-list-select source', async () => {
+  it('handles build-list-select source for finished builds', async () => {
     const projectId = uuidv4();
     jest
       .mocked(getRecentBuildsForSubmissionAsync)
@@ -269,6 +281,57 @@ describe(getArchiveAsync, () => {
     expect(archive.sourceType).toBe(ArchiveSourceType.build);
   });
 
+  it('handles build-list-select source for in-progress builds', async () => {
+    const projectId = uuidv4();
+    jest
+      .mocked(getRecentBuildsForSubmissionAsync)
+      .mockResolvedValueOnce([MOCK_IN_PROGRESS_BUILD_FRAGMENT as BuildFragment]);
+    jest
+      .mocked(promptAsync)
+      .mockResolvedValueOnce({ selectedBuild: MOCK_IN_PROGRESS_BUILD_FRAGMENT });
+
+    const archive = await getArchiveAsync(
+      { ...SOURCE_STUB_INPUT, graphqlClient, projectId },
+      {
+        sourceType: ArchiveSourceType.buildList,
+      }
+    );
+
+    expect(getRecentBuildsForSubmissionAsync).toBeCalledWith(
+      graphqlClient,
+      toAppPlatform(SOURCE_STUB_INPUT.platform),
+      projectId,
+      { limit: BUILD_LIST_ITEM_COUNT }
+    );
+    expect(archive.sourceType).toBe(ArchiveSourceType.build);
+  });
+
+  it('handles build-list-select source for both finished and in-progress builds', async () => {
+    const projectId = uuidv4();
+    jest
+      .mocked(getRecentBuildsForSubmissionAsync)
+      .mockResolvedValueOnce([
+        MOCK_IN_PROGRESS_BUILD_FRAGMENT as BuildFragment,
+        MOCK_BUILD_FRAGMENT as BuildFragment,
+      ]);
+    jest.mocked(promptAsync).mockResolvedValueOnce({ selectedBuild: MOCK_BUILD_FRAGMENT });
+
+    const archive = await getArchiveAsync(
+      { ...SOURCE_STUB_INPUT, graphqlClient, projectId },
+      {
+        sourceType: ArchiveSourceType.buildList,
+      }
+    );
+
+    expect(getRecentBuildsForSubmissionAsync).toBeCalledWith(
+      graphqlClient,
+      toAppPlatform(SOURCE_STUB_INPUT.platform),
+      projectId,
+      { limit: BUILD_LIST_ITEM_COUNT }
+    );
+    expect(archive.sourceType).toBe(ArchiveSourceType.build);
+  });
+
   it('prompts again if all builds have expired', async () => {
     jest.mocked(getRecentBuildsForSubmissionAsync).mockResolvedValueOnce([
       {

packages/eas-cli/src/submit/utils/__tests__/builds-test.ts

@@ -0,0 +1,226 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus,
+  SubmissionArchiveSourceType,
+} from '../../../graphql/generated';
+import { BuildQuery } from '../../../graphql/queries/BuildQuery';
+import { getRecentBuildsForSubmissionAsync } from '../builds';
+
+jest.mock('../../../graphql/queries/BuildQuery', () => ({
+  BuildQuery: {
+    viewBuildsOnAppAsync: jest.fn(),
+  },
+}));
+
+const ARCHIVE_SOURCE = {
+  type: SubmissionArchiveSourceType.Url,
+  url: 'https://url.to/archive.tar.gz',
+};
+
+const MOCK_BUILD_FRAGMENTS: Partial<BuildFragment>[] = Array(5).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.Finished,
+}));
+const MOCK_IN_PROGRESS_BUILD_FRAGMENTS: Partial<BuildFragment>[] = Array(2).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.InProgress,
+}));
+const MOCK_IN_QUEUE_BUILD_FRAGMENTS = Array(2).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.InQueue,
+}));
+const MOCK_NEW_BUILD_FRAGMENTS = Array(1).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.New,
+}));
+
+describe(getRecentBuildsForSubmissionAsync, () => {
+  let graphqlClient: ExpoGraphqlClient;
+
+  beforeEach(() => {
+    graphqlClient = {} as any as ExpoGraphqlClient;
+  });
+
+  it('returns finished builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(
+        MOCK_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      );
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_BUILD_FRAGMENTS.slice(0, Math.min(limit, MOCK_BUILD_FRAGMENTS.length))
+    );
+  });
+
+  it('returns in-progress builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(
+        MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_PROGRESS_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(
+        0,
+        Math.min(limit, MOCK_IN_PROGRESS_BUILD_FRAGMENTS.length)
+      )
+    );
+  });
+
+  it('returns in-queue builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(
+        MOCK_IN_QUEUE_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_QUEUE_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_IN_QUEUE_BUILD_FRAGMENTS.slice(0, Math.min(limit, MOCK_IN_QUEUE_BUILD_FRAGMENTS.length))
+    );
+  });
+
+  it('returns new builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(
+        MOCK_NEW_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_NEW_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_NEW_BUILD_FRAGMENTS.slice(0, Math.min(limit, MOCK_NEW_BUILD_FRAGMENTS.length))
+    );
+  });
+
+  it('returns up to "limit" newest builds regardless of status', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(
+        MOCK_NEW_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_NEW_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce(
+        MOCK_IN_QUEUE_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_QUEUE_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce(
+        MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_PROGRESS_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce(
+        MOCK_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      );
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject([MOCK_NEW_BUILD_FRAGMENTS[0], MOCK_IN_QUEUE_BUILD_FRAGMENTS[1]]);
+  });
+});