[continuous-deploy-fingerprint] Improve build filtering (#303)

expo · Sep 16, 2024 · e780e57 · e780e57
1 parent 047ecf1
commit e780e57
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 38 deletions.
diff --git a/build/command/index.js b/build/command/index.js
diff --git a/build/continuous-deploy-fingerprint/index.js b/build/continuous-deploy-fingerprint/index.js
diff --git a/build/preview-build/index.js b/build/preview-build/index.js
diff --git a/build/preview-comment/index.js b/build/preview-comment/index.js
diff --git a/build/preview/index.js b/build/preview/index.js
diff --git a/build/setup/index.js b/build/setup/index.js
diff --git a/src/actions/continuous-deploy-fingerprint.ts b/src/actions/continuous-deploy-fingerprint.ts
@@ -5,7 +5,7 @@ import { ExpoConfig } from '@expo/config';
 
 import { createDetails, getQrTarget, getSchemesInOrderFromConfig } from '../comment';
 import { EasUpdate, getUpdateGroupQr, getUpdateGroupWebsite } from '../eas';
-import { AppPlatform, BuildInfo, appPlatformEmojis, getBuildLogsUrl } from '../expo';
+import { AppPlatform, BuildInfo, BuildStatus, appPlatformEmojis, getBuildLogsUrl } from '../expo';
 import { createIssueComment, hasPullContext, pullContext } from '../github';
 import { loadProjectConfig } from '../project';
 import { executeAction } from '../worker';
@@ -151,8 +151,6 @@ async function getBuildInfoWithFingerprintAsync({
         'build:list',
         '--platform',
         platform,
-        '--status',
-        'finished',
         '--buildProfile',
         profile,
         '--runtimeVersion',
@@ -177,23 +175,19 @@ async function getBuildInfoWithFingerprintAsync({
     throw new Error(`Could not get EAS builds for project`);
   }
 
-  if (!builds[0]) {
-    return null;
-  }
-
-  const build = builds[0] as BuildInfo;
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
 
-  if (excludeExpiredBuilds) {
+  const buildsThatAreValid = (builds as BuildInfo[]).filter(build => {
+    const isValidStatus = [BuildStatus.New, BuildStatus.InQueue, BuildStatus.InProgress, BuildStatus.Finished].includes(
+      build.status
+    );
     // if the build is expired or will expire within the next day,
-    // return null to trigger a new build
-    const tomorrow = new Date();
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    if (tomorrow > new Date(build.expirationDate)) {
-      return null;
-    }
-  }
+    const isValidExpiry = excludeExpiredBuilds ? new Date(build.expirationDate) < tomorrow : true;
+    return isValidStatus && isValidExpiry;
+  });
 
-  return build;
+  return buildsThatAreValid[0] ?? null;
 }
 
 async function createEASBuildAsync({

diff --git a/src/expo.ts b/src/expo.ts
@@ -25,6 +25,16 @@ export enum AppPlatform {
   Ios = 'IOS',
 }
 
+export enum BuildStatus {
+  New = 'NEW',
+  InQueue = 'IN_QUEUE',
+  InProgress = 'IN_PROGRESS',
+  PendingCancel = 'PENDING_CANCEL',
+  Errored = 'ERRORED',
+  Finished = 'FINISHED',
+  Canceled = 'CANCELED',
+}
+
 export type BuildInfo = {
   id: string;
   platform: AppPlatform;
@@ -43,6 +53,7 @@ export type BuildInfo = {
   appVersion: string;
   gitCommitHash: string;
   expirationDate: string;
+  status: BuildStatus;
 };
 
 export const appPlatformDisplayNames: Record<AppPlatform, string> = {