Merge pull request #69 from technote-space/fix/#67

chore: consider that api not include current run (#67)

Author: technote-space

__tests__/process.test.ts

@@ -83,7 +83,18 @@ describe('execute', () => {
       'target event: \x1b[32;40mpush\x1b[0m',
       'target branch: \x1b[32;40mrelease/v1.2.3\x1b[0m',
       '::group::workflow runs:',
-      getLogStdout([]),
+      getLogStdout([
+        {
+          'id': 30433642,
+          'head_branch': 'master',
+          'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+          'run_number': 562,
+          'event': 'push',
+          'status': 'queued',
+          'created_at': '2020-01-22T19:33:08Z',
+          'updated_at': '2020-02-22T19:33:08Z',
+        },
+      ]),
       '::endgroup::',
       '',
       '::group::Cancelling...',
@@ -293,4 +304,122 @@ describe('execute', () => {
 
     expect(sleepFn).toBeCalledWith(123);
   });
+
+  it('should cancel jobs (get workflow runs api not contains this run)', async() => {
+    // workflow-run.list
+    // 30433642 run_number=562, updated_at=2020-02-22T19:33:08Z (re-run)          => expected that this will be cancelled
+    // 30433643 run_number=563, updated_at=2020-01-23T19:33:08Z (merge commit)    => expected that this will be cancelled
+    // 30433644 run_number=564, updated_at=2020-01-24T19:33:08Z                   => expected that this will be cancelled
+    // 30433645 run_number=565, updated_at=2020-01-25T19:33:08Z                   => expected that this will be cancelled
+    // 30433646 run_number=566, updated_at=2020-01-25T19:33:08Z (target run)      => expected that this will not be cancelled
+    // 30433646~30433649                                        (different event) => expected that this will not be cancelled
+
+    const mockStdout = spyOnStdout();
+    nock('https://api.github.com')
+      .get('/repos/hello/world/actions/runs/30433646')
+      .reply(200, () => getApiFixture(fixturesDir, 'workflow-run.get.30433646'))
+      .get('/repos/hello/world/actions/workflows/111566/runs?status=in_progress&branch=release%2Fv1.2.3')
+      .reply(200, () => getApiFixture(fixturesDir, 'workflow-run.list'))
+      .post('/repos/hello/world/actions/runs/30433642/cancel')
+      .reply(202)
+      .post('/repos/hello/world/actions/runs/30433643/cancel')
+      .reply(202)
+      .post('/repos/hello/world/actions/runs/30433644/cancel')
+      .reply(202)
+      .post('/repos/hello/world/actions/runs/30433645/cancel')
+      .reply(202);
+
+    await execute(new Logger(), getOctokit(), generateContext({owner: 'hello', repo: 'world', event: 'pull_request'}, {
+      runId: 30433646,
+      payload: {
+        'pull_request': {
+          head: {
+            ref: 'release/v1.2.3',
+          },
+        },
+      },
+    }));
+
+    stdoutCalledWith(mockStdout, [
+      '> run id: 30433646',
+      '::group::run:',
+      getLogStdout({
+        'id': 30433646,
+        'head_branch': 'master',
+        'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+        'run_number': 566,
+        'event': 'push',
+        'status': 'queued',
+        'created_at': '2020-01-24T19:33:08Z',
+        'updated_at': '2020-01-24T19:33:08Z',
+      }),
+      '::endgroup::',
+      '> workflow id: 111566',
+      'target event: \x1b[32;40mpull_request\x1b[0m',
+      'target branch: \x1b[32;40mrelease/v1.2.3\x1b[0m',
+      '::group::workflow runs:',
+      getLogStdout([
+        {
+          'id': 30433642,
+          'head_branch': 'master',
+          'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+          'run_number': 562,
+          'event': 'pull_request',
+          'status': 'queued',
+          'created_at': '2020-01-22T19:33:08Z',
+          'updated_at': '2020-02-22T19:33:08Z',
+        },
+        {
+          'id': 30433643,
+          'head_branch': 'master',
+          'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+          'run_number': 563,
+          'event': 'pull_request',
+          'status': 'queued',
+          'created_at': '2020-01-23T19:33:08Z',
+          'updated_at': '2020-01-23T19:33:08Z',
+        },
+        {
+          'id': 30433644,
+          'head_branch': 'master',
+          'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+          'run_number': 564,
+          'event': 'pull_request',
+          'status': 'queued',
+          'created_at': '2020-01-24T19:33:08Z',
+          'updated_at': '2020-01-24T19:33:08Z',
+        },
+        {
+          'id': 30433645,
+          'head_branch': 'master',
+          'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+          'run_number': 565,
+          'event': 'pull_request',
+          'status': 'queued',
+          'created_at': '2020-01-25T19:33:08Z',
+          'updated_at': '2020-01-25T19:33:08Z',
+        },
+        {
+          'id': 30433646,
+          'head_branch': 'master',
+          'head_sha': 'acb5820ced9479c074f688cc328bf03f341a511d',
+          'run_number': 566,
+          'event': 'push',
+          'status': 'queued',
+          'created_at': '2020-01-24T19:33:08Z',
+          'updated_at': '2020-01-24T19:33:08Z',
+        },
+      ]),
+      '::endgroup::',
+      '',
+      '::group::Cancelling...',
+      'cancel: 30433642',
+      'cancel: 30433643',
+      'cancel: 30433644',
+      'cancel: 30433645',
+      '> total: 4',
+      '::set-output name=ids::30433642,30433643,30433644,30433645',
+      '::endgroup::',
+    ]);
+  });
 });

src/process.ts

@@ -25,6 +25,9 @@ export const execute = async(logger: Logger, octokit: Octokit, context: Context)
   logger.info('workflow id: %d', workflowId);
 
   const runs = await getWorkflowRuns(workflowId, logger, octokit, context);
+  if (!runs.some(_run => _run.run_number === run.run_number)) {
+    runs.push(run);
+  }
   logger.startProcess('workflow runs:');
   console.log(runs.map(run => getFilteredRun(run)));
   logger.endProcess();