Skip to content

Implementing bot logic to close PRs with no changes #1307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Implementing bot logic to close PRs with no changes #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e9e113
Close zero-edited-file PRs
Copilot Jun 24, 2026
22a71a6
Add zero-file PR regression test
Copilot Jun 24, 2026
52c92f2
Use fixture for zero-edited-files behavior
Copilot Jun 25, 2026
0743d6f
Fix remove-state fixture regression for shouldClose
Copilot Jun 25, 2026
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
1 change: 1 addition & 0 deletions packages/mergebot/src/_tests/fixtures/74980-zero-edited-files/_downloads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions packages/mergebot/src/_tests/fixtures/74980-zero-edited-files/_files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
133 changes: 133 additions & 0 deletions packages/mergebot/src/_tests/fixtures/74980-zero-edited-files/_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"data": {
"repository": {
"id": "MDEwOlJlcG9zaXRvcnk2MDkzMzE2",
"pullRequest": {
"id": "PR_kwDOAFz6BM7aQ8jd",
"title": "just Update package.json",
"createdAt": "2026-05-11T13:20:01Z",
"author": {
"login": "justinkrn68-droid",
"__typename": "User"
},
"authorAssociation": "FIRST_TIME_CONTRIBUTOR",
"baseRef": {
"name": "master",
"__typename": "Ref"
},
"labels": {
"nodes": [],
"__typename": "LabelConnection"
},
"isDraft": false,
"mergeable": "MERGEABLE",
"number": 74980,
"state": "OPEN",
"headRefOid": "c6d1344b3c7e49f62f4befd1aaa8665eb6bd6864",
"baseRefOid": "84efd8820459db1cdaad122f2347683b7db023ee",
"changedFiles": 0,
"additions": 0,
"deletions": 0,
"commitIds": {
"totalCount": 1,
"nodes": [
{
"commit": {
"oid": "c6d1344b3c7e49f62f4befd1aaa8665eb6bd6864",
"parents": {
"nodes": [
{
"oid": "84efd8820459db1cdaad122f2347683b7db023ee",
"__typename": "Commit"
}
],
"__typename": "CommitConnection"
},
"__typename": "Commit"
},
"__typename": "PullRequestCommit"
}
],
"__typename": "PullRequestCommitConnection"
},
"timelineItems": {
"nodes": [],
"__typename": "PullRequestTimelineItemsConnection"
},
"reviews": {
"totalCount": 0,
"nodes": [],
"__typename": "PullRequestReviewConnection"
},
"commits": {
"totalCount": 1,
"nodes": [
{
"commit": {
"checkSuites": {
"nodes": [
{
"databaseId": 68415365071,
"app": {
"name": "GitHub Actions",
"__typename": "App"
},
"conclusion": "ACTION_REQUIRED",
"resourcePath": "/DefinitelyTyped/DefinitelyTyped/commit/c6d1344b3c7e49f62f4befd1aaa8665eb6bd6864/checks?check_suite_id=68415365071",
"status": "COMPLETED",
"url": "https://github.com/DefinitelyTyped/DefinitelyTyped/commit/c6d1344b3c7e49f62f4befd1aaa8665eb6bd6864/checks?check_suite_id=68415365071",
"checkRuns": {
"nodes": [],
"__typename": "CheckRunConnection"
},
"createdAt": "2026-05-11T13:20:11Z",
"workflowRun": {
"databaseId": 25672723099,
"file": {
"path": ".github/workflows/CI.yml",
"__typename": "WorkflowRunFile"
},
"__typename": "WorkflowRun"
},
"__typename": "CheckSuite"
}
],
"__typename": "CheckSuiteConnection"
},
"status": null,
"authoredDate": "2026-05-11T13:19:36Z",
"committedDate": "2026-05-11T13:19:36Z",
"pushedDate": null,
"oid": "c6d1344b3c7e49f62f4befd1aaa8665eb6bd6864",
"__typename": "Commit"
},
"__typename": "PullRequestCommit"
}
],
"__typename": "PullRequestCommitConnection"
},
"comments": {
"totalCount": 0,
"nodes": [],
"__typename": "IssueCommentConnection"
},
"files": {
"totalCount": 0,
"nodes": [],
"pageInfo": {
"hasNextPage": false,
"endCursor": "MQ",
"__typename": "PageInfo"
},
"__typename": "PullRequestChangedFileConnection"
},
"projectItems": {
"nodes": [],
"__typename": "ProjectV2ItemConnection"
},
"__typename": "PullRequest"
},
"__typename": "Repository"
}
}
}
7 changes: 7 additions & 0 deletions packages/mergebot/src/_tests/fixtures/74980-zero-edited-files/derived.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "remove",
"now": "2026-06-09T18:11:33.900Z",
"message": "PR has no edited files",
"isDraft": false,
"shouldClose": true
}
10 changes: 10 additions & 0 deletions packages/mergebot/src/_tests/fixtures/74980-zero-edited-files/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"mutation": "mutation ($input: ClosePullRequestInput!) {\n closePullRequest(input: $input) {\n __typename\n }\n}",
"variables": {
"input": {
"pullRequestId": "PR_kwDOAFz6BM7aQ8jd"
}
}
}
]
8 changes: 8 additions & 0 deletions packages/mergebot/src/_tests/fixtures/74980-zero-edited-files/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"labels": [],
"responseComments": [],
"shouldClose": true,
"shouldMerge": false,
"shouldUpdateLabels": false,
"projectColumn": "*REMOVE*"
}
1 change: 1 addition & 0 deletions packages/mergebot/src/compute-pr-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ export function process(prInfo: BotResult, extendedCallback: (info: ExtendedPrIn
return {
...createEmptyActions(),
projectColumn: prInfo.isDraft ? "Needs Author Action" : "*REMOVE*",
shouldClose: !!prInfo.shouldClose,
};
}

Expand Down
7 changes: 5 additions & 2 deletions packages/mergebot/src/pr-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ interface BotEnsureRemovedFromProject {
readonly now: Date;
readonly message: string;
readonly isDraft: boolean;
readonly shouldClose?: boolean;
}

export interface PackageInfo {
Expand Down Expand Up @@ -216,6 +217,7 @@ export async function deriveStateForPR(

if (prInfo.isDraft) return botEnsureRemovedFromProject("PR is a draft");
if (prInfo.state !== "OPEN") return botEnsureRemovedFromProject("PR is not active");
if (prInfo.changedFiles === 0) return botEnsureRemovedFromProject("PR has no edited files", true);

const headCommit = getHeadCommit(prInfo);
// eslint-disable-next-line eqeqeq
Expand Down Expand Up @@ -316,8 +318,9 @@ export async function deriveStateForPR(
return { type: "error", now, message, author: prInfo.author?.login };
}

function botEnsureRemovedFromProject(message: string): BotEnsureRemovedFromProject {
return { type: "remove", now, message, isDraft: prInfo.isDraft };
function botEnsureRemovedFromProject(message: string, shouldClose = false): BotEnsureRemovedFromProject {
const base: BotEnsureRemovedFromProject = { type: "remove", now, message, isDraft: prInfo.isDraft };
return shouldClose ? { ...base, shouldClose: true } : base;
}
}

Expand Down