Skip to content
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

Jump to bottom

Move blessed mergable PRs into new column, fix blessed PRs with partial approvals #1046

Merged
merged 6 commits into from
Aug 9, 2024
Merged

Move blessed mergable PRs into new column, fix blessed PRs with partial approvals #1046

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0435b71
Add test
jakebailey Aug 8, 2024
9fc9ce2
Move blessed mergable PRs into new column
jakebailey Aug 8, 2024
b52e734
Fix column name check
jakebailey Aug 8, 2024
b5fe050
Simplify check
jakebailey Aug 8, 2024
c59308c
Require all packages to be approved when blessed, fix a couple of pro…
jakebailey Aug 9, 2024
1391891
Simplify
jakebailey Aug 9, 2024
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/cachedQueries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = ((h) => ({
["Waiting for Code Reviews (Blessed)", "e2dd54d5"],
["Waiting for Code Reviews", "98236657"],
["Needs Author Action", "d389394c"],
["Waiting for Author to Merge (Blessed)", "a4b0585f"],
["Waiting for Author to Merge", "7da042bf"],
["Recently Merged", "fee515dc"],
["Other", "4ab7a682"],
Expand Down
13 changes: 13 additions & 0 deletions packages/mergebot/src/_tests/fixtures/45884/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@
}
}
},
{
"mutation": "mutation ($input: UpdateProjectV2ItemFieldValueInput!) {\n updateProjectV2ItemFieldValue(input: $input) {\n __typename\n }\n}\n",
"variables": {
"input": {
"itemId": "MDExOlByb2plY3RDYXJkNDEyNTM4NTk=",
"projectId": "PVT_kwDOADeBNM4AkH1q",
"fieldId": "PVTSSF_lADOADeBNM4AkH1qzgcYOEM",
"value": {
"singleSelectOptionId": "a4b0585f"
}
}
}
},
{
"mutation": "mutation ($input: AddCommentInput!) {\n addComment(input: $input) {\n __typename\n }\n}\n",
"variables": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/45884/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectColumn": "Waiting for Author to Merge",
"projectColumn": "Waiting for Author to Merge (Blessed)",
"labels": [
"Owner Approved",
"Untested Change",
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/45999/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"projectId": "PVT_kwDOADeBNM4AkH1q",
"fieldId": "PVTSSF_lADOADeBNM4AkH1qzgcYOEM",
"value": {
"singleSelectOptionId": "7da042bf"
"singleSelectOptionId": "a4b0585f"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/45999/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectColumn": "Waiting for Author to Merge",
"projectColumn": "Waiting for Author to Merge (Blessed)",
"labels": [
"Critical package",
"Owner Approved",
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/46008/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"projectId": "PVT_kwDOADeBNM4AkH1q",
"fieldId": "PVTSSF_lADOADeBNM4AkH1qzgcYOEM",
"value": {
"singleSelectOptionId": "7da042bf"
"singleSelectOptionId": "a4b0585f"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/46008/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectColumn": "Waiting for Author to Merge",
"projectColumn": "Waiting for Author to Merge (Blessed)",
"labels": [
"Owner Approved",
"Untested Change",
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/47017-blessed-and-two-owner/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"projectId": "PVT_kwDOADeBNM4AkH1q",
"fieldId": "PVTSSF_lADOADeBNM4AkH1qzgcYOEM",
"value": {
"singleSelectOptionId": "7da042bf"
"singleSelectOptionId": "a4b0585f"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/47017-blessed-and-two-owner/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectColumn": "Waiting for Author to Merge",
"projectColumn": "Waiting for Author to Merge (Blessed)",
"labels": [
"Critical package",
"Owner Approved",
Expand Down
3 changes: 2 additions & 1 deletion packages/mergebot/src/_tests/fixtures/52848/derived.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"headCommitOid": "14499debca98ea23cfc47a80a288d5bd32798cff",
"mergeBaseOid": "master",
"lastPushDate": "2021-05-10T07:57:17.000Z",
"lastActivityDate": "2021-05-10T07:59:10.000Z",
"lastActivityDate": "2021-05-10T15:42:52.000Z",
"maintainerBlessed": "Waiting for Author to Merge (Blessed)",
"hasMergeConflict": false,
"isFirstContribution": true,
"tooManyFiles": false,
Expand Down
3 changes: 3 additions & 0 deletions packages/mergebot/src/_tests/fixtures/70150/_downloads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"chrome": 3423683
}
4 changes: 4 additions & 0 deletions packages/mergebot/src/_tests/fixtures/70150/_files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"1d59977cdbcf917a961d68022373e42858d55b08:types/chrome/package.json": "{\n \"private\": true,\n \"name\": \"@types/chrome\",\n \"version\": \"0.0.9999\",\n \"projects\": [\n \"http://developer.chrome.com/extensions/\"\n ],\n \"dependencies\": {\n \"@types/filesystem\": \"*\",\n \"@types/har-format\": \"*\"\n },\n \"devDependencies\": {\n \"@types/chrome\": \"workspace:.\",\n \"@types/jquery\": \"*\",\n \"@types/jqueryui\": \"*\"\n },\n \"owners\": [\n {\n \"name\": \"Matthew Kimber\",\n \"githubUsername\": \"matthewkimber\"\n },\n {\n \"name\": \"otiai10\",\n \"githubUsername\": \"otiai10\"\n },\n {\n \"name\": \"sreimer15\",\n \"githubUsername\": \"sreimer15\"\n },\n {\n \"name\": \"MatCarlson\",\n \"githubUsername\": \"MatCarlson\"\n },\n {\n \"name\": \"ekinsol\",\n \"githubUsername\": \"ekinsol\"\n },\n {\n \"name\": \"Brian Wilson\",\n \"githubUsername\": \"echoabstract\"\n },\n {\n \"name\": \"Sebastiaan Pasma\",\n \"githubUsername\": \"spasma\"\n },\n {\n \"name\": \"bdbai\",\n \"githubUsername\": \"bdbai\"\n },\n {\n \"name\": \"pokutuna\",\n \"githubUsername\": \"pokutuna\"\n },\n {\n \"name\": \"Jason Xian\",\n \"githubUsername\": \"JasonXian\"\n },\n {\n \"name\": \"userTim\",\n \"githubUsername\": \"usertim\"\n },\n {\n \"name\": \"Idan Zeierman\",\n \"githubUsername\": \"idan315\"\n },\n {\n \"name\": \"Nicolas Rodriguez\",\n \"githubUsername\": \"nicolas377\"\n },\n {\n \"name\": \"Ido Salomon\",\n \"githubUsername\": \"idosal\"\n },\n {\n \"name\": \"Federico Brigante\",\n \"githubUsername\": \"fregante\"\n }\n ]\n}\n",
"22560146e216e1508aa2cd038b4c856d3a99d297:types/chrome/package.json": "{\n \"private\": true,\n \"name\": \"@types/chrome\",\n \"version\": \"0.0.9999\",\n \"projects\": [\n \"http://developer.chrome.com/extensions/\"\n ],\n \"dependencies\": {\n \"@types/filesystem\": \"*\",\n \"@types/har-format\": \"*\"\n },\n \"devDependencies\": {\n \"@types/chrome\": \"workspace:.\",\n \"@types/jquery\": \"*\",\n \"@types/jqueryui\": \"*\"\n },\n \"owners\": [\n {\n \"name\": \"Matthew Kimber\",\n \"githubUsername\": \"matthewkimber\"\n },\n {\n \"name\": \"otiai10\",\n \"githubUsername\": \"otiai10\"\n },\n {\n \"name\": \"sreimer15\",\n \"githubUsername\": \"sreimer15\"\n },\n {\n \"name\": \"MatCarlson\",\n \"githubUsername\": \"MatCarlson\"\n },\n {\n \"name\": \"ekinsol\",\n \"githubUsername\": \"ekinsol\"\n },\n {\n \"name\": \"Brian Wilson\",\n \"githubUsername\": \"echoabstract\"\n },\n {\n \"name\": \"Sebastiaan Pasma\",\n \"githubUsername\": \"spasma\"\n },\n {\n \"name\": \"bdbai\",\n \"githubUsername\": \"bdbai\"\n },\n {\n \"name\": \"pokutuna\",\n \"githubUsername\": \"pokutuna\"\n },\n {\n \"name\": \"Jason Xian\",\n \"githubUsername\": \"JasonXian\"\n },\n {\n \"name\": \"userTim\",\n \"githubUsername\": \"usertim\"\n },\n {\n \"name\": \"Idan Zeierman\",\n \"githubUsername\": \"idan315\"\n },\n {\n \"name\": \"Nicolas Rodriguez\",\n \"githubUsername\": \"nicolas377\"\n },\n {\n \"name\": \"Ido Salomon\",\n \"githubUsername\": \"idosal\"\n },\n {\n \"name\": \"Federico Brigante\",\n \"githubUsername\": \"fregante\"\n }\n ]\n}\n"
}
275 changes: 275 additions & 0 deletions packages/mergebot/src/_tests/fixtures/70150/_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
{
"data": {
"repository": {
"id": "MDEwOlJlcG9zaXRvcnk2MDkzMzE2",
"pullRequest": {
"id": "PR_kwDOAFz6BM52pmtc",
"title": "Fix getCurrent API return type",
"createdAt": "2024-07-27T18:32:13Z",
"author": {
"login": "sebasjm",
"__typename": "User"
},
"authorAssociation": "FIRST_TIME_CONTRIBUTOR",
"baseRef": {
"name": "master",
"__typename": "Ref"
},
"labels": {
"nodes": [
{
"name": "Popular package",
"__typename": "Label"
},
{
"name": "Owner Approved",
"__typename": "Label"
},
{
"name": "Untested Change",
"__typename": "Label"
},
{
"name": "Unreviewed",
"__typename": "Label"
}
],
"__typename": "LabelConnection"
},
"isDraft": false,
"mergeable": "MERGEABLE",
"number": 70150,
"state": "OPEN",
"headRefOid": "22560146e216e1508aa2cd038b4c856d3a99d297",
"changedFiles": 1,
"additions": 1,
"deletions": 1,
"commitIds": {
"nodes": [
{
"commit": {
"oid": "22560146e216e1508aa2cd038b4c856d3a99d297",
"parents": {
"nodes": [
{
"oid": "1d59977cdbcf917a961d68022373e42858d55b08",
"__typename": "Commit"
}
],
"__typename": "CommitConnection"
},
"__typename": "Commit"
},
"__typename": "PullRequestCommit"
}
],
"__typename": "PullRequestCommitConnection"
},
"timelineItems": {
"nodes": [],
"__typename": "PullRequestTimelineItemsConnection"
},
"reviews": {
"nodes": [
{
"author": {
"login": "nicolas377",
"__typename": "User"
},
"commit": {
"oid": "22560146e216e1508aa2cd038b4c856d3a99d297",
"__typename": "Commit"
},
"comments": {
"nodes": [],
"__typename": "PullRequestReviewCommentConnection"
},
"authorAssociation": "CONTRIBUTOR",
"state": "APPROVED",
"submittedAt": "2024-08-08T01:48:22Z",
"url": "https://github.com/DefinitelyTyped/DefinitelyTyped/pull/70150#pullrequestreview-2226663312",
"__typename": "PullRequestReview"
}
],
"__typename": "PullRequestReviewConnection"
},
"commits": {
"totalCount": 1,
"nodes": [
{
"commit": {
"checkSuites": {
"nodes": [
{
"databaseId": 26499959468,
"app": {
"name": "GitHub Actions",
"__typename": "App"
},
"conclusion": "SUCCESS",
"resourcePath": "/DefinitelyTyped/DefinitelyTyped/commit/22560146e216e1508aa2cd038b4c856d3a99d297/checks?check_suite_id=26499959468",
"status": "COMPLETED",
"url": "https://github.com/DefinitelyTyped/DefinitelyTyped/commit/22560146e216e1508aa2cd038b4c856d3a99d297/checks?check_suite_id=26499959468",
"checkRuns": {
"nodes": [
{
"title": null,
"__typename": "CheckRun"
}
],
"__typename": "CheckRunConnection"
},
"createdAt": "2024-07-27T18:32:16Z",
"workflowRun": {
"file": {
"path": ".github/workflows/CI.yml",
"__typename": "WorkflowRunFile"
},
"__typename": "WorkflowRun"
},
"__typename": "CheckSuite"
}
],
"__typename": "CheckSuiteConnection"
},
"status": null,
"authoredDate": "2024-07-27T18:27:23Z",
"committedDate": "2024-07-27T18:27:23Z",
"pushedDate": null,
"oid": "22560146e216e1508aa2cd038b4c856d3a99d297",
"__typename": "Commit"
},
"__typename": "PullRequestCommit"
}
],
"__typename": "PullRequestCommitConnection"
},
"comments": {
"totalCount": 5,
"nodes": [
{
"id": "IC_kwDOAFz6BM6GXLU7",
"author": {
"login": "typescript-bot",
"__typename": "User"
},
"databaseId": 2254222651,
"body": "@sebasjm Thank you for submitting this PR! I see this is your first time submitting to DefinitelyTyped 👋 — I'm the local bot who will help you through the process of getting things through.\n\n***This is a live comment that I will keep updated.***\n\n## 1 package in this PR\n\n* `chrome` — [on npm](https://www.npmjs.com/package/chrome), [on unpkg](https://unpkg.com/browse/chrome@latest/)\n - owner-approval: @nicolas377\n\n## Code Reviews\n\nThis PR can be merged once it's reviewed by a DT maintainer.\n\nYou can test the changes of this PR [in the Playground](https://www.typescriptlang.org/play/?dtPR=70150&install-plugin=playground-dt-review).\n\n## Status\n\n * ✅ No merge conflicts\n * ✅ Continuous integration tests have passed\n * 🕐 Only a DT maintainer can approve changes [without tests](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-test-editing-an-existing-package)\n\nOnce every item on this list is checked, I'll ask you for permission to merge and publish the changes.\n\n## Inactive\n\nThis PR has been inactive for 12 days — please try to get reviewers!\n\n----------------------\n... diagnostics scrubbed ...\n<!--typescript_bot_welcome-->",
"createdAt": "2024-07-27T18:32:48Z",
"reactions": {
"nodes": [],
"__typename": "ReactionConnection"
},
"__typename": "IssueComment"
},
{
"id": "IC_kwDOAFz6BM6GXLVD",
"author": {
"login": "typescript-bot",
"__typename": "User"
},
"databaseId": 2254222659,
"body": "Hey @sebasjm,\n\n:unamused: Your PR doesn't modify any tests, so it's hard to know what's being fixed, and your changes might regress in the future. Please consider [adding tests](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-test-editing-an-existing-package) to cover the change you're making. Including tests allows this PR to be merged by yourself and the owners of this module.\n\n***This can potentially save days of time for you!***\n<!--typescript_bot_suggest-testing-->",
"createdAt": "2024-07-27T18:32:50Z",
"reactions": {
"nodes": [],
"__typename": "ReactionConnection"
},
"__typename": "IssueComment"
},
{
"id": "IC_kwDOAFz6BM6GXLVH",
"author": {
"login": "typescript-bot",
"__typename": "User"
},
"databaseId": 2254222663,
"body": "🔔 @matthewkimber @otiai10 @sreimer15 @MatCarlson @ekinsol @echoabstract @spasma @bdbai @pokutuna @JasonXian @usertim @idan315 @nicolas377 @idosal @fregante — please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/70150/files) in the next few days. Be sure to explicitly select **`Approve`** or **`Request Changes`** in the GitHub UI so I know what's going on.\n<!--typescript_bot_pinging-reviewers-->",
"createdAt": "2024-07-27T18:32:50Z",
"reactions": {
"nodes": [],
"__typename": "ReactionConnection"
},
"__typename": "IssueComment"
},
{
"id": "IC_kwDOAFz6BM6HjFTU",
"author": {
"login": "typescript-bot",
"__typename": "User"
},
"databaseId": 2274120916,
"body": "Re-ping @matthewkimber, @otiai10, @sreimer15, @MatCarlson, @ekinsol, @echoabstract, @spasma, @bdbai, @pokutuna, @JasonXian, @usertim, @idan315, @idosal, @fregante:\n\nThis PR has been out for over a week, yet I haven't seen any reviews.\n\nCould someone please give it some attention? Thanks!\n<!--typescript_bot_Unreviewed:nearly:2024-07-27-->",
"createdAt": "2024-08-07T18:46:14Z",
"reactions": {
"nodes": [],
"__typename": "ReactionConnection"
},
"__typename": "IssueComment"
},
{
"id": "IC_kwDOAFz6BM6Hll8v",
"author": {
"login": "typescript-bot",
"__typename": "User"
},
"databaseId": 2274778927,
"body": ":hourglass_flowing_sand: Hi @sebasjm,\n\nIt's been a few days since this PR was approved by nicolas377 and we're waiting for a DT maintainer to give a review.\n\nIf you would like to short-circuit this wait, you can edit some of the [test files](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-my-package-teststs) in the package that verify how the `.d.ts` files work. This would allow the PR to be merged by you or the DT module owners after a re-review.\n<!--typescript_bot_wait-for-merge-offer-2256014-->",
"createdAt": "2024-08-08T01:48:58Z",
"reactions": {
"nodes": [],
"__typename": "ReactionConnection"
},
"__typename": "IssueComment"
}
],
"__typename": "IssueCommentConnection"
},
"files": {
"totalCount": 1,
"nodes": [
{
"path": "types/chrome/index.d.ts",
"additions": 1,
"deletions": 1,
"__typename": "PullRequestChangedFile"
}
],
"pageInfo": {
"hasNextPage": false,
"endCursor": "MQ",
"__typename": "PageInfo"
},
"__typename": "PullRequestChangedFileConnection"
},
"projectItems": {
"nodes": [
{
"id": "PVTI_lADOADeBNM4AkH1qzgRRbnM",
"project": {
"id": "PVT_kwDOADeBNM4AkH1q",
"number": 1,
"__typename": "ProjectV2"
},
"fieldValueByName": {
"name": "Waiting for Code Reviews (Blessed)",
"field": {
"id": "PVTSSF_lADOADeBNM4AkH1qzgcYOEM",
"__typename": "ProjectV2SingleSelectField"
},
"__typename": "ProjectV2ItemFieldSingleSelectValue"
},
"updatedAt": "2024-08-08T20:06:29Z",
"__typename": "ProjectV2Item"
}
],
"__typename": "ProjectV2ItemConnection"
},
"__typename": "PullRequest"
},
"__typename": "Repository"
}
},
"loading": false,
"networkStatus": 7
}
Loading
Loading