diff --git a/package.json b/package.json index e79d2f4..b1bd1fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@technote-space/github-action-pr-helper", - "version": "2.1.4", + "version": "2.1.5", "description": "PullRequest Helper for GitHub Actions.", "keywords": [ "github", diff --git a/src/utils/process.ts b/src/utils/process.ts index cd9e6e2..2c9683c 100644 --- a/src/utils/process.ts +++ b/src/utils/process.ts @@ -258,7 +258,7 @@ const createPr = async(makeGroup: boolean, isClose: boolean, helper: GitHelper, return createCommit(isActionPr(context), isClose, logger, octokit, context); } - const {files, output} = await getChangedFiles(helper, logger, octokit, context); + const {files, output, aborted} = await getChangedFiles(helper, logger, octokit, context); const branchName = await getPrBranchName(helper, octokit, context); let result: 'succeeded' | 'not changed' = 'succeeded'; let detail = 'updated'; @@ -269,7 +269,7 @@ const createPr = async(makeGroup: boolean, isClose: boolean, helper: GitHelper, return processResult.result; } - mergeable = processResult.mergeable; + mergeable = !aborted && processResult.mergeable; if (mergeable) { result = 'not changed'; detail = 'There is no diff';