fix: types of octokit

Author: technote-space

Diff for: 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);
 

Diff for: 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