Merge pull request #75 from technote-space/release/next-v1.7.3

release: v1.7.4

Author: technote-space

Diff for: __tests__/process.test.ts

@@ -42,6 +42,7 @@ describe('execute', () => {
 
     stdoutCalledWith(mockStdout, [
       '> This is not target context.',
+      '',
       '::set-output name=ids::',
     ]);
   });
@@ -99,6 +100,7 @@ describe('execute', () => {
       '',
       '::group::Cancelling...',
       '> total: 0',
+      '',
       '::set-output name=ids::',
       '::endgroup::',
     ]);
@@ -203,6 +205,7 @@ describe('execute', () => {
       'cancel: 30433643',
       'cancel: 30433644',
       '> total: 3',
+      '',
       '::set-output name=ids::30433642,30433643,30433644',
       '::endgroup::',
     ]);
@@ -298,6 +301,7 @@ describe('execute', () => {
       '::group::Cancelling...',
       'cancel: 30433644',
       '> total: 1',
+      '',
       '::set-output name=ids::30433644',
       '::endgroup::',
     ]);
@@ -418,6 +422,7 @@ describe('execute', () => {
       'cancel: 30433644',
       'cancel: 30433645',
       '> total: 4',
+      '',
       '::set-output name=ids::30433642,30433643,30433644,30433645',
       '::endgroup::',
     ]);
@@ -530,6 +535,7 @@ describe('execute', () => {
       'cancel: 30433644',
       '::error::request to https://api.github.com/repos/hello/world/actions/runs/30433644/cancel failed, reason: Cannot cancel a workflow run that is completed.',
       '> total: 3',
+      '',
       '::set-output name=ids::30433642,30433643,30433644',
       '::endgroup::',
     ]);

Diff for: __tests__/utils/misc.test.ts

@@ -1,8 +1,10 @@
 /* eslint-disable no-magic-numbers */
+import type {components} from '@octokit/openapi-types';
 import {resolve} from 'path';
 import {testEnv, generateContext} from '@technote-space/github-action-test-helper';
-import {isExcludeContext, isConsiderReRun, getIntervalMs, getTargetRunId, getTargetBranch} from '../../src/utils/misc';
+import {isExcludeContext, isNotExcludeRun, isConsiderReRun, getIntervalMs, getTargetRunId, getTargetBranch} from '../../src/utils/misc';
 
+type ActionsListWorkflowRunsResponseData = components['schemas']['workflow-run'];
 const rootDir = resolve(__dirname, '../..');
 
 describe('isExcludeContext', () => {
@@ -43,6 +45,29 @@ describe('isExcludeContext', () => {
   });
 });
 
+describe('isNotExcludeRun', () => {
+  testEnv(rootDir);
+
+  it('should return true 1', () => {
+    process.env.INPUT_EXCLUDE_MERGED = 'false';
+    expect(isNotExcludeRun({} as ActionsListWorkflowRunsResponseData)).toBe(true);
+  });
+
+  it('should return true 2', () => {
+    process.env.INPUT_EXCLUDE_MERGED       = 'true';
+    process.env.INPUT_MERGE_MESSAGE_PREFIX = 'test';
+    expect(isNotExcludeRun({} as ActionsListWorkflowRunsResponseData)).toBe(true);
+    expect(isNotExcludeRun({'head_commit': {message: ''}} as ActionsListWorkflowRunsResponseData)).toBe(true);
+    expect(isNotExcludeRun({'head_commit': {message: 'aaa'}} as ActionsListWorkflowRunsResponseData)).toBe(true);
+  });
+
+  it('should return false', () => {
+    process.env.INPUT_EXCLUDE_MERGED       = 'true';
+    process.env.INPUT_MERGE_MESSAGE_PREFIX = 'test';
+    expect(isNotExcludeRun({'head_commit': {message: 'test aaa'}} as ActionsListWorkflowRunsResponseData)).toBe(false);
+  });
+});
+
 describe('isConsiderReRun', () => {
   testEnv(rootDir);
 

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/auto-cancel-redundant-workflow",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "GitHub Actions to automatically cancel redundant workflow.",
   "keywords": [
     "github",
@@ -31,39 +31,39 @@
     "lint:fix": "eslint --fix 'src/**/*.ts' '__tests__/**/*.ts'",
     "release": "yarn release-ga --test",
     "test": "yarn lint && yarn cover",
-    "update": "npx npm-check-updates -u && yarn install && yarn upgrade && yarn audit",
+    "update": "npm_config_yes=true npx npm-check-updates -u --timeout 100000 && yarn install && yarn upgrade && yarn audit",
     "postinstall": "[ -n \"$CI\" ] || [ ! -f node_modules/.bin/husky ] || husky install",
     "prepublishOnly": "[ -n \"$CI\" ] || [ ! -f node_modules/.bin/pinst ] || pinst --disable",
     "postpublish": "[ -n \"$CI\" ] || [ ! -f node_modules/.bin/pinst ] || pinst --enable"
   },
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.2.7",
     "@actions/github": "^4.0.0",
-    "@octokit/openapi-types": "^5.1.1",
-    "@octokit/plugin-paginate-rest": "^2.10.0",
-    "@octokit/plugin-rest-endpoint-methods": "^4.12.2",
-    "@octokit/types": "^6.10.1",
-    "@technote-space/github-action-helper": "^5.2.2",
-    "@technote-space/github-action-log-helper": "^0.1.19"
+    "@octokit/openapi-types": "^6.2.1",
+    "@octokit/plugin-paginate-rest": "^2.13.3",
+    "@octokit/plugin-rest-endpoint-methods": "^5.1.1",
+    "@octokit/types": "^6.14.1",
+    "@technote-space/github-action-helper": "^5.2.6",
+    "@technote-space/github-action-log-helper": "^0.1.24"
   },
   "devDependencies": {
-    "@commitlint/cli": "^12.0.0",
-    "@commitlint/config-conventional": "^12.0.0",
-    "@technote-space/github-action-test-helper": "^0.7.2",
-    "@technote-space/release-github-actions-cli": "^1.8.4",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.31",
-    "@typescript-eslint/eslint-plugin": "^4.15.2",
-    "@typescript-eslint/parser": "^4.15.2",
-    "eslint": "^7.20.0",
-    "husky": "^5.1.1",
+    "@commitlint/cli": "^12.1.1",
+    "@commitlint/config-conventional": "^12.1.1",
+    "@technote-space/github-action-test-helper": "^0.7.9",
+    "@technote-space/release-github-actions-cli": "^1.8.5",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.0.1",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.22.0",
+    "eslint": "^7.25.0",
+    "husky": "^6.0.0",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",
     "lint-staged": "^10.5.4",
-    "nock": "^13.0.8",
+    "nock": "^13.0.11",
     "pinst": "^2.1.6",
-    "ts-jest": "^26.5.2",
-    "typescript": "^4.2.2"
+    "ts-jest": "^26.5.5",
+    "typescript": "^4.2.4"
   },
   "publishConfig": {
     "access": "public"

Diff for: src/process.ts

@@ -1,6 +1,6 @@
-import {Context} from '@actions/github/lib/context';
-import {Octokit} from '@technote-space/github-action-helper/dist/types';
-import {Logger} from '@technote-space/github-action-log-helper';
+import type {Context} from '@actions/github/lib/context';
+import type {Octokit} from '@technote-space/github-action-helper/dist/types';
+import type {Logger} from '@technote-space/github-action-log-helper';
 import {setOutput} from '@actions/core';
 import {Utils} from '@technote-space/github-action-helper';
 import {getTargetRunId, isExcludeContext, isConsiderReRun, getIntervalMs, getFilteredRun} from './utils/misc';

Diff for: src/utils/misc.ts

@@ -1,7 +1,7 @@
+import type {components} from '@octokit/openapi-types';
+import type {Context} from '@actions/github/lib/context';
 import {getInput} from '@actions/core';
-import {Context} from '@actions/github/lib/context';
 import {ContextHelper, Utils} from '@technote-space/github-action-helper';
-import {components} from '@octokit/openapi-types';
 import {SHOW_PROPERTIES} from '../constant';
 
 type ActionsListWorkflowRunsResponseData = components['schemas']['workflow-run'];
@@ -25,7 +25,7 @@ export const isExcludeContext = (context: Context): boolean =>
     (isExcludeTagPush() && Utils.isTagRef(context)) ||
     (isExcludeMerged() && getMergeMessagePrefix().test(context.payload.head_commit.message))
   );
-export const isNotExcludeRun  = (run: ActionsListWorkflowRunsResponseData): boolean => !isExcludeMerged() || !getMergeMessagePrefix().test(run.head_commit.message);
+export const isNotExcludeRun  = (run: ActionsListWorkflowRunsResponseData): boolean => !isExcludeMerged() || !getMergeMessagePrefix().test(run.head_commit?.message ?? '');
 export const getTargetRunId   = (context: Context): number => parseNumber(getInput('TARGET_RUN_ID'), context.runId);
 export const getTargetBranch  = async(context: Context): Promise<string | undefined> => {
   if (context.payload.pull_request) {

Diff for: src/utils/workflow.ts

@@ -1,10 +1,10 @@
-import {Context} from '@actions/github/lib/context';
-import {Octokit} from '@technote-space/github-action-helper/dist/types';
-import {Logger} from '@technote-space/github-action-log-helper';
+import type {OctokitResponse} from '@octokit/types';
+import type {PaginateInterface} from '@octokit/plugin-paginate-rest';
+import type {Octokit} from '@technote-space/github-action-helper/dist/types';
+import type {Context} from '@actions/github/lib/context';
+import type {Logger} from '@technote-space/github-action-log-helper';
+import type {components} from '@octokit/openapi-types';
 import {Utils} from '@technote-space/github-action-helper';
-import {PaginateInterface} from '@octokit/plugin-paginate-rest';
-import {RestEndpointMethods} from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types';
-import {components} from '@octokit/openapi-types';
 import {getTargetBranch, isNotExcludeRun} from './misc';
 
 type ActionsGetWorkflowRunResponseData = components['schemas']['workflow-run'];
@@ -55,7 +55,7 @@ export const getWorkflowRuns = async(workflowId: number, logger: Logger, octokit
   }
 
   return (await (octokit.paginate as PaginateInterface)(
-    (octokit as RestEndpointMethods).actions.listWorkflowRuns,
+    octokit.actions.listWorkflowRuns,
     // eslint-disable-next-line no-warning-comments
     // TODO: remove ts-ignore after fixed types (https://github.com/octokit/types.ts/issues/122)
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -64,7 +64,7 @@ export const getWorkflowRuns = async(workflowId: number, logger: Logger, octokit
   )).map(run => run as ActionsListWorkflowRunsResponseData).filter(run => run.event === context.eventName).filter(isNotExcludeRun);
 };
 
-export const cancelWorkflowRun = async(runId: number, octokit: Octokit, context: Context): Promise<void> => (octokit as RestEndpointMethods).actions.cancelWorkflowRun({
+export const cancelWorkflowRun = async(runId: number, octokit: Octokit, context: Context): Promise<OctokitResponse<{ [key: string]: unknown; }>> => octokit.actions.cancelWorkflowRun({
   ...context.repo,
   'run_id': runId,
 });