Merge pull request #56 from technote-space/release/next-v1.6.4

release: v1.6.5

Author: technote-space

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/auto-cancel-redundant-workflow",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "GitHub Actions to automatically cancel redundant workflow.",
   "keywords": [
     "github",
@@ -36,26 +36,27 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/github": "^4.0.0",
-    "@octokit/plugin-paginate-rest": "^2.6.0",
-    "@octokit/plugin-rest-endpoint-methods": "^4.2.1",
-    "@octokit/types": "^5.5.0",
-    "@technote-space/github-action-helper": "^4.2.7",
-    "@technote-space/github-action-log-helper": "^0.1.8"
+    "@octokit/openapi-types": "^2.0.0",
+    "@octokit/plugin-paginate-rest": "^2.6.2",
+    "@octokit/plugin-rest-endpoint-methods": "^4.4.1",
+    "@octokit/types": "^6.1.1",
+    "@technote-space/github-action-helper": "^4.4.4",
+    "@technote-space/github-action-log-helper": "^0.1.9"
   },
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
-    "@technote-space/github-action-test-helper": "^0.6.4",
-    "@technote-space/release-github-actions-cli": "^1.7.2",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.9",
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
-    "eslint": "^7.14.0",
-    "husky": "^4.3.0",
+    "@technote-space/github-action-test-helper": "^0.6.5",
+    "@technote-space/release-github-actions-cli": "^1.7.3",
+    "@types/jest": "^26.0.16",
+    "@types/node": "^14.14.10",
+    "@typescript-eslint/eslint-plugin": "^4.9.0",
+    "@typescript-eslint/parser": "^4.9.0",
+    "eslint": "^7.15.0",
+    "husky": "^4.3.5",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",
-    "lint-staged": "^10.5.1",
+    "lint-staged": "^10.5.3",
     "nock": "^13.0.5",
     "ts-jest": "^26.4.4",
     "typescript": "^4.1.2"

src/utils/misc.ts

@@ -2,9 +2,12 @@ import {getInput} from '@actions/core';
 import {Context} from '@actions/github/lib/context';
 import {Octokit} from '@technote-space/github-action-helper/dist/types';
 import {ContextHelper, Utils} from '@technote-space/github-action-helper';
-import {ActionsListWorkflowRunsResponseData, ActionsGetWorkflowRunResponseData} from '@octokit/types';
+import {components} from '@octokit/openapi-types';
 import {SHOW_PROPERTIES} from '../constant';
 
+type ActionsListWorkflowRunsResponseData = components['schemas']['workflow-run'];
+type ActionsGetWorkflowRunResponseData = components['schemas']['workflow-run'];
+
 const getMergeMessagePrefix   = (): RegExp => Utils.getPrefixRegExp(getInput('MERGE_MESSAGE_PREFIX'));
 const isExcludeMerged         = (): boolean => Utils.getBoolValue(getInput('EXCLUDE_MERGED'));
 const isExcludeTagPush        = (): boolean => Utils.getBoolValue(getInput('EXCLUDE_TAG_PUSH'));
@@ -13,7 +16,7 @@ export const isExcludeContext = (context: Context): boolean =>
     (isExcludeTagPush() && Utils.isTagRef(context)) ||
     (isExcludeMerged() && getMergeMessagePrefix().test(context.payload.head_commit.message))
   );
-export const isNotExcludeRun  = (run: ActionsListWorkflowRunsResponseData['workflow_runs'][number]): boolean => !isExcludeMerged() || !getMergeMessagePrefix().test(run.head_commit.message);
+export const isNotExcludeRun  = (run: ActionsListWorkflowRunsResponseData): boolean => !isExcludeMerged() || !getMergeMessagePrefix().test(run.head_commit.message);
 
 export const getRunId = (): number => Number(process.env.GITHUB_RUN_ID);
 

src/utils/workflow.ts

@@ -1,11 +1,15 @@
 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 {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 {ActionsListWorkflowRunsResponseData, ActionsGetWorkflowRunResponseData} from '@octokit/types';
+import {components} from '@octokit/openapi-types';
 import {getTargetBranch, isNotExcludeRun} from './misc';
 
+type ActionsGetWorkflowRunResponseData = components['schemas']['workflow-run'];
+type ActionsListWorkflowRunsResponseData = components['schemas']['workflow-run'];
+
 export const getWorkflowRun = async(octokit: Octokit, context: Context): Promise<ActionsGetWorkflowRunResponseData> => {
   return (await octokit.actions.getWorkflowRun({
     owner: context.repo.owner,
@@ -23,11 +27,11 @@ export const getWorkflowId = (run: ActionsGetWorkflowRunResponseData): number |
   return Number(matches[0]);
 };
 
-export const getWorkflowRunCreatedAt = (run: ActionsGetWorkflowRunResponseData): string => run.created_at;
+export const getWorkflowRunCreatedAt = (run: ActionsGetWorkflowRunResponseData): string => Utils.ensureNotNull(run.created_at);
 
 export const getWorkflowRunNumber = (run: ActionsGetWorkflowRunResponseData): number => run.run_number;
 
-export const getWorkflowRuns = async(workflowId: number, logger: Logger, octokit: Octokit, context: Context): Promise<ActionsListWorkflowRunsResponseData['workflow_runs']> => {
+export const getWorkflowRuns = async(workflowId: number, logger: Logger, octokit: Octokit, context: Context): Promise<Array<ActionsListWorkflowRunsResponseData>> => {
   const options: {
     owner: string;
     repo: string;
@@ -57,7 +61,7 @@ export const getWorkflowRuns = async(workflowId: number, logger: Logger, octokit
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     options,
-  )).map(run => run as ActionsListWorkflowRunsResponseData['workflow_runs'][number]).filter(run => run.event === context.eventName).filter(isNotExcludeRun);
+  )).map(run => run as ActionsListWorkflowRunsResponseData).filter(run => run.event === context.eventName).filter(isNotExcludeRun);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",
+    "target": "ES2019",
     /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",
     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */