Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/utils/process.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down