Take queued runs into account on wait

orcasecurity · Jan 21, 2021 · b010239 · b010239
1 parent 8db075d
commit b010239
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/__tests__/wait.test.ts b/__tests__/wait.test.ts
@@ -146,6 +146,11 @@ describe("wait", () => {
             status: "in_progress",
             html_url: "3",
           },
+          {
+            id: 4,
+            status: "queued",
+            html_url: "4",
+          },
         ];
         // Give the current run an id that makes it the last in the queue.
         input.runId = inProgressRuns.length + 1;
@@ -160,7 +165,7 @@ describe("wait", () => {
         const mockedRunsFunc = jest.fn();
         mockedRunsFunc
           .mockReturnValueOnce(Promise.resolve(inProgressRuns.slice(0)))
-          .mockReturnValueOnce(Promise.resolve(inProgressRuns.slice(0, 2)))
+          .mockReturnValueOnce(Promise.resolve(inProgressRuns.slice(0, 3)))
           .mockReturnValueOnce(Promise.resolve(inProgressRuns))
           // Finally return just the run that was queued _after_ the "input" run.
           .mockReturnValue(

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/github.ts b/src/github.ts
@@ -66,7 +66,6 @@ export class OctokitGitHub implements GitHub {
       owner,
       repo,
       workflow_id,
-      status: "in_progress",
     };
 
     if (branch) {

diff --git a/src/wait.ts b/src/wait.ts
@@ -50,6 +50,7 @@ export class Waiter implements Wait {
       this.workflowId
     );
     const previousRuns = runs
+      .filter((run) => ["in_progress", "queued"].includes(run.status))
       .filter((run) => run.id < this.input.runId)
       .sort((a, b) => b.id - a.id);
     if (!previousRuns || !previousRuns.length) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,6 @@ export class OctokitGitHub implements GitHub { @@
           owner,
           repo,
           workflow_id,
-          status: "in_progress",
         };
         if (branch) {
@@ Expand Down @@