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 5 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
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/68510/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"variables": {
"input": {
"subjectId": "PR_kwDOAFz6BM5mMibM",
"body": "@andrewbranch Thank you for submitting this PR!\n\n***This is a live comment that I will keep updated.***\n\n## 0 packages in this PR\n\n\n## Code Reviews\n\nBecause you edited one package and there were no type definition changes, I can help you merge this PR once someone else signs off on it.\n\nYou can test the changes of this PR [in the Playground](https://www.typescriptlang.org/play/?dtPR=68510&install-plugin=playground-dt-review).\n\n## Status\n\n * ✅ No merge conflicts\n * 🕐 Continuous integration tests are still running\n * 🕐 Most recent commit is approved by type definition owners, DT maintainers or others\n\nOnce every item on this list is checked, I'll ask you for permission to merge and publish the changes.\n\n----------------------\n... diagnostics scrubbed ...\n<!--typescript_bot_welcome-->"
"body": "@andrewbranch Thank you for submitting this PR!\n\n***This is a live comment that I will keep updated.***\n\n## 0 packages in this PR\n\n\n## Code Reviews\n\nBecause you edited one package and there were no type definition changes, I can help you merge this PR once someone else signs off on it.\n\nYou can test the changes of this PR [in the Playground](https://www.typescriptlang.org/play/?dtPR=68510&install-plugin=playground-dt-review).\n\n## Status\n\n * ✅ No merge conflicts\n * 🕐 Continuous integration tests are still running\n * 🕐 Most recent commit is approved by a DT maintainer\n\nOnce every item on this list is checked, I'll ask you for permission to merge and publish the changes.\n\n----------------------\n... diagnostics scrubbed ...\n<!--typescript_bot_welcome-->"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/mergebot/src/_tests/fixtures/68510/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"responseComments": [
{
"tag": "welcome",
"status": "@andrewbranch Thank you for submitting this PR!\n\n***This is a live comment that I will keep updated.***\n\n## 0 packages in this PR\n\n\n## Code Reviews\n\nBecause you edited one package and there were no type definition changes, I can help you merge this PR once someone else signs off on it.\n\nYou can test the changes of this PR [in the Playground](https://www.typescriptlang.org/play/?dtPR=68510&install-plugin=playground-dt-review).\n\n## Status\n\n * ✅ No merge conflicts\n * 🕐 Continuous integration tests are still running\n * 🕐 Most recent commit is approved by type definition owners, DT maintainers or others\n\nOnce every item on this list is checked, I'll ask you for permission to merge and publish the changes.\n\n----------------------\n... diagnostics scrubbed ..."
"status": "@andrewbranch Thank you for submitting this PR!\n\n***This is a live comment that I will keep updated.***\n\n## 0 packages in this PR\n\n\n## Code Reviews\n\nBecause you edited one package and there were no type definition changes, I can help you merge this PR once someone else signs off on it.\n\nYou can test the changes of this PR [in the Playground](https://www.typescriptlang.org/play/?dtPR=68510&install-plugin=playground-dt-review).\n\n## Status\n\n * ✅ No merge conflicts\n * 🕐 Continuous integration tests are still running\n * 🕐 Most recent commit is approved by a DT maintainer\n\nOnce every item on this list is checked, I'll ask you for permission to merge and publish the changes.\n\n----------------------\n... diagnostics scrubbed ..."
},
{
"tag": "pinging-reviewers-others",
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"
}
Loading
Loading