diff --git a/src/_tests/fixtures/38979/result.json b/src/_tests/fixtures/38979/result.json index 9e4f86768..4aadc8423 100644 --- a/src/_tests/fixtures/38979/result.json +++ b/src/_tests/fixtures/38979/result.json @@ -23,7 +23,5 @@ "status": "It has been more than two weeks and this PR still has no reviews.\n\nI'll bump it to the DT maintainer queue. Thank you for your patience, @ExE-Boss.\n\n(Ping @RReverser.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43136/result.json b/src/_tests/fixtures/43136/result.json index 12032f5f7..681d9a444 100644 --- a/src/_tests/fixtures/43136/result.json +++ b/src/_tests/fixtures/43136/result.json @@ -17,7 +17,5 @@ "status": "@RReverser Thank you for reviewing this PR! The author has pushed new commits since your last review. Could you take another look and submit a fresh review?" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43144/result.json b/src/_tests/fixtures/43144/result.json index 45a4e1bd7..55183e1c6 100644 --- a/src/_tests/fixtures/43144/result.json +++ b/src/_tests/fixtures/43144/result.json @@ -14,7 +14,5 @@ "status": "@jeffreymeng Everything looks good here. Great job! I am ready to merge this PR (at f1f5c4b) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@pocesar: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43151/result.json b/src/_tests/fixtures/43151/result.json index 40774ebc6..de519b23e 100644 --- a/src/_tests/fixtures/43151/result.json +++ b/src/_tests/fixtures/43151/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @adamzerella β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/43151/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43160/result.json b/src/_tests/fixtures/43160/result.json index 96f97be94..080909b44 100644 --- a/src/_tests/fixtures/43160/result.json +++ b/src/_tests/fixtures/43160/result.json @@ -19,7 +19,5 @@ "status": "@rikkertkoppes The CI build failed! Please [review the logs for more information](https://github.com/DefinitelyTyped/DefinitelyTyped/commit/22c73c88cc9c09efd4c2998ec360607dd4c36c2e/checks?check_suite_id=731664306).\r\n\r\nOnce you've pushed the fixes, the build will automatically re-run. Thanks!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43175/result.json b/src/_tests/fixtures/43175/result.json index ed353aad4..6ffc82411 100644 --- a/src/_tests/fixtures/43175/result.json +++ b/src/_tests/fixtures/43175/result.json @@ -22,7 +22,5 @@ "status": "@couven92 Thank you for reviewing this PR! The author has pushed new commits since your last review. Could you take another look and submit a fresh review?" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43235/result.json b/src/_tests/fixtures/43235/result.json index 98df32379..46e6a8226 100644 --- a/src/_tests/fixtures/43235/result.json +++ b/src/_tests/fixtures/43235/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @Esri @bsvensson β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/43235/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43314/result.json b/src/_tests/fixtures/43314/result.json index a24135c5a..d6439bfeb 100644 --- a/src/_tests/fixtures/43314/result.json +++ b/src/_tests/fixtures/43314/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @metonym β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/43314/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43695-duplicate-comment/result.json b/src/_tests/fixtures/43695-duplicate-comment/result.json index 635381cd5..b5a2f1d11 100644 --- a/src/_tests/fixtures/43695-duplicate-comment/result.json +++ b/src/_tests/fixtures/43695-duplicate-comment/result.json @@ -22,7 +22,5 @@ "status": "It has been more than two weeks and this PR still has no reviews.\n\nI'll bump it to the DT maintainer queue. Thank you for your patience, @alexandercerutti.\n\n(Ping Β«anyone?Β».)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43695-post-review/result.json b/src/_tests/fixtures/43695-post-review/result.json index 9b2906d85..8eafa3a54 100644 --- a/src/_tests/fixtures/43695-post-review/result.json +++ b/src/_tests/fixtures/43695-post-review/result.json @@ -14,7 +14,5 @@ "status": "@alexandercerutti One or more reviewers has requested changes. Please address their comments. I'll be back once they sign off or you've pushed new commits. Thank you!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43695/result.json b/src/_tests/fixtures/43695/result.json index 6584189f3..0e0c9f4b6 100644 --- a/src/_tests/fixtures/43695/result.json +++ b/src/_tests/fixtures/43695/result.json @@ -14,7 +14,5 @@ "status": "@alexandercerutti One or more reviewers has requested changes. Please address their comments. I'll be back once they sign off or you've pushed new commits. Thank you!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/43960-post-close/result.json b/src/_tests/fixtures/43960-post-close/result.json index 25a0649e0..a9dcd8b69 100644 --- a/src/_tests/fixtures/43960-post-close/result.json +++ b/src/_tests/fixtures/43960-post-close/result.json @@ -1,8 +1,6 @@ { "labels": [], "responseComments": [], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": false, "projectColumn": "*REMOVE*" } diff --git a/src/_tests/fixtures/43960/result.json b/src/_tests/fixtures/43960/result.json index 87058c31d..995cad0d7 100644 --- a/src/_tests/fixtures/43960/result.json +++ b/src/_tests/fixtures/43960/result.json @@ -14,7 +14,5 @@ "status": "@aaltepet One or more reviewers has requested changes. Please address their comments. I'll be back once they sign off or you've pushed new commits. Thank you!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44105/result.json b/src/_tests/fixtures/44105/result.json index 25a0649e0..a9dcd8b69 100644 --- a/src/_tests/fixtures/44105/result.json +++ b/src/_tests/fixtures/44105/result.json @@ -1,8 +1,6 @@ { "labels": [], "responseComments": [], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": false, "projectColumn": "*REMOVE*" } diff --git a/src/_tests/fixtures/44256/result.json b/src/_tests/fixtures/44256/result.json index 25a0649e0..a9dcd8b69 100644 --- a/src/_tests/fixtures/44256/result.json +++ b/src/_tests/fixtures/44256/result.json @@ -1,8 +1,6 @@ { "labels": [], "responseComments": [], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": false, "projectColumn": "*REMOVE*" } diff --git a/src/_tests/fixtures/44267/result.json b/src/_tests/fixtures/44267/result.json index 07a76aaef..1cb9daf20 100644 --- a/src/_tests/fixtures/44267/result.json +++ b/src/_tests/fixtures/44267/result.json @@ -14,7 +14,5 @@ "status": "@ErikMartensson 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 which I will keep updated.***\n\n## 1 package in this PR\n\n* `intercom-client` [on npm](https://www.npmjs.com/package/intercom-client), [on unpkg](https://unpkg.com/browse/intercom-client@latest/)\n - owner-approval: @malithrw\n\n## Code Reviews\n\nThis PR can be merged once it's reviewed by a DT maintainer.\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----------------------\n... diagnostics scrubbed ..." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44282/result.json b/src/_tests/fixtures/44282/result.json index 5432fc6f4..8cc89bc0e 100644 --- a/src/_tests/fixtures/44282/result.json +++ b/src/_tests/fixtures/44282/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @fishcharlie β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44282/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44288/result.json b/src/_tests/fixtures/44288/result.json index 430e4a7ec..4fa87e521 100644 --- a/src/_tests/fixtures/44288/result.json +++ b/src/_tests/fixtures/44288/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @gosticks β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44288/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44290/result.json b/src/_tests/fixtures/44290/result.json index 29193b41e..1c5848287 100644 --- a/src/_tests/fixtures/44290/result.json +++ b/src/_tests/fixtures/44290/result.json @@ -1,8 +1,6 @@ { "labels": [], "responseComments": [], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": false, "projectColumn": "Needs Author Action" } diff --git a/src/_tests/fixtures/44299-with-files/result.json b/src/_tests/fixtures/44299-with-files/result.json index 74eb804a6..4e13ed867 100644 --- a/src/_tests/fixtures/44299-with-files/result.json +++ b/src/_tests/fixtures/44299-with-files/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @geopic β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44299/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44299/result.json b/src/_tests/fixtures/44299/result.json index 74eb804a6..4e13ed867 100644 --- a/src/_tests/fixtures/44299/result.json +++ b/src/_tests/fixtures/44299/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @geopic β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44299/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44316/result.json b/src/_tests/fixtures/44316/result.json index 4ab158a5d..bce7d96f1 100644 --- a/src/_tests/fixtures/44316/result.json +++ b/src/_tests/fixtures/44316/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @mattleff β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44316/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44343-pending-travis/result.json b/src/_tests/fixtures/44343-pending-travis/result.json index 4b68d799c..43d34718a 100644 --- a/src/_tests/fixtures/44343-pending-travis/result.json +++ b/src/_tests/fixtures/44343-pending-travis/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @joeriks β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44343/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44343-pre-travis/result.json b/src/_tests/fixtures/44343-pre-travis/result.json index 4b68d799c..43d34718a 100644 --- a/src/_tests/fixtures/44343-pre-travis/result.json +++ b/src/_tests/fixtures/44343-pre-travis/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @joeriks β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44343/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44343/result.json b/src/_tests/fixtures/44343/result.json index 4b68d799c..43d34718a 100644 --- a/src/_tests/fixtures/44343/result.json +++ b/src/_tests/fixtures/44343/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @joeriks β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44343/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44402/result.json b/src/_tests/fixtures/44402/result.json index a4564c748..7cca8a742 100644 --- a/src/_tests/fixtures/44402/result.json +++ b/src/_tests/fixtures/44402/result.json @@ -16,7 +16,5 @@ "status": "@sandersn Everything looks good here. Great job! I am ready to merge this PR (at 5dfb994) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44411/result.json b/src/_tests/fixtures/44411/result.json index c59433a23..9f09e7c21 100644 --- a/src/_tests/fixtures/44411/result.json +++ b/src/_tests/fixtures/44411/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @dawnmist @erbridge β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44411/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44424-1-travis-instantly-finished/result.json b/src/_tests/fixtures/44424-1-travis-instantly-finished/result.json index c0132242a..47f32c0de 100644 --- a/src/_tests/fixtures/44424-1-travis-instantly-finished/result.json +++ b/src/_tests/fixtures/44424-1-travis-instantly-finished/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @chrisbarker @rdepena @whyn07m3 @licui3936 β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44424/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44424-2-after-travis-second/result.json b/src/_tests/fixtures/44424-2-after-travis-second/result.json index 6c7848152..796001279 100644 --- a/src/_tests/fixtures/44424-2-after-travis-second/result.json +++ b/src/_tests/fixtures/44424-2-after-travis-second/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @chrisbarker @rdepena @whyn07m3 @licui3936 β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44424/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44437/result.json b/src/_tests/fixtures/44437/result.json index 3d5eb758f..94a979892 100644 --- a/src/_tests/fixtures/44437/result.json +++ b/src/_tests/fixtures/44437/result.json @@ -16,7 +16,5 @@ "status": "@johnnyreilly Everything looks good here. Great job! I am ready to merge this PR (at eb92456) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@Berkays, @unindented, @kamontat, @theweirdone, @whoaa512: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44439/result.json b/src/_tests/fixtures/44439/result.json index 63d6173e2..5c40ca6ec 100644 --- a/src/_tests/fixtures/44439/result.json +++ b/src/_tests/fixtures/44439/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @lith-light-g β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/44439/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44631/result.json b/src/_tests/fixtures/44631/result.json index 5f5055668..601d6d3a3 100644 --- a/src/_tests/fixtures/44631/result.json +++ b/src/_tests/fixtures/44631/result.json @@ -14,7 +14,5 @@ "status": "@mAAdhaTTah Unfortunately, this pull request currently has a merge conflict πŸ˜₯. Please update your PR branch to be up-to-date with respect to master. Have a nice day!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44857/result.json b/src/_tests/fixtures/44857/result.json index 1e15ff729..b64ddf3bf 100644 --- a/src/_tests/fixtures/44857/result.json +++ b/src/_tests/fixtures/44857/result.json @@ -23,7 +23,5 @@ "status": "It has been more than two weeks and this PR still has no reviews.\n\nI'll bump it to the DT maintainer queue. Thank you for your patience, @ExE-Boss.\n\n(Ping @Microsoft, @DefinitelyTyped, @jkomyno, @a-tarasyuk, @alvis, @r3nya, @btoueg, @brunoscheufler, @smac89, @touffy, @DeividasBakanas, @eyqs, @Flarna, @Hannes-Magnusson-CK, @KSXGitHub, @hoo29, @kjin, @ajafff, @islishude, @mwiktorczyk, @mohsen1, @n-e, @galkin, @parambirs, @eps1lon, @SimonSchick, @ThomasdenH, @WilcoBakker, @wwwy3y3, @samuela, @kuehlein, @j-oliveras, @bhongy, @chyzwar, @trivikr, @nguymin4, @yoursunny, @qwelias, @Ryan-Willpower, @peterblazejewicz, @addaleax, @JasonHK.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44989-14days/result.json b/src/_tests/fixtures/44989-14days/result.json index 174b6fdd7..81521a71a 100644 --- a/src/_tests/fixtures/44989-14days/result.json +++ b/src/_tests/fixtures/44989-14days/result.json @@ -20,7 +20,5 @@ "status": "Re-ping @petr-motejlek / @TheHandsomeCoder, @donnut, @mdekrey, @sbking, @afharo, @teves-castro, @1M0reBug, @hojberg, @samsonkeung, @angeloocana, @raynerd, @moshensky, @ethanresnick, @deftomat, @blimusiek, @biern, @rayhaneh, @rgm, @drewwyatt, @jottenlips, @minitesh, @krantisinh, @pirix-gh, @brekk, @nemo108, @jituanlin, @Philippe-mills, @Saul-Mirone, @Nicholaiii:\n\nThis PR has been ready to merge for over a week, and I haven't seen any requests to merge it. I will close it on Jul 6th (in three weeks) if this doesn't happen.\n\n(If there's no reason to avoid merging it, please do so. Otherwise, if it shouldn't be merged or if it needs more time, please close it or turn it into a draft.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44989-32days/result.json b/src/_tests/fixtures/44989-32days/result.json index 99c96f3da..b69d302e4 100644 --- a/src/_tests/fixtures/44989-32days/result.json +++ b/src/_tests/fixtures/44989-32days/result.json @@ -20,7 +20,6 @@ "status": "After a month, no one has requested merging the PR 😞. I'm going to assume that the change is not wanted after all, and will therefore close it." } ], - "shouldClose": true, - "shouldMerge": false, - "shouldUpdateLabels": true + "shouldUpdateLabels": true, + "state": "close" } diff --git a/src/_tests/fixtures/44989-3days/result.json b/src/_tests/fixtures/44989-3days/result.json index 8e55d8484..11229b96a 100644 --- a/src/_tests/fixtures/44989-3days/result.json +++ b/src/_tests/fixtures/44989-3days/result.json @@ -15,7 +15,5 @@ "status": "@petr-motejlek Everything looks good here. Great job! I am ready to merge this PR (at 9ca6086) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@TheHandsomeCoder, @donnut, @mdekrey, @sbking, @afharo, @teves-castro, @1M0reBug, @hojberg, @samsonkeung, @angeloocana, @raynerd, @moshensky, @ethanresnick, @deftomat, @blimusiek, @biern, @rayhaneh, @rgm, @drewwyatt, @jottenlips, @minitesh, @krantisinh, @pirix-gh, @brekk, @nemo108, @jituanlin, @Philippe-mills, @Saul-Mirone, @Nicholaiii: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/44989-7days/result.json b/src/_tests/fixtures/44989-7days/result.json index 1503b80c5..3bb7b474c 100644 --- a/src/_tests/fixtures/44989-7days/result.json +++ b/src/_tests/fixtures/44989-7days/result.json @@ -15,7 +15,5 @@ "status": "@petr-motejlek Everything looks good here. Great job! I am ready to merge this PR (at 9ca6086) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@TheHandsomeCoder, @donnut, @mdekrey, @sbking, @afharo, @teves-castro, @1M0reBug, @hojberg, @samsonkeung, @angeloocana, @raynerd, @moshensky, @ethanresnick, @deftomat, @blimusiek, @biern, @rayhaneh, @rgm, @drewwyatt, @jottenlips, @minitesh, @krantisinh, @pirix-gh, @brekk, @nemo108, @jituanlin, @Philippe-mills, @Saul-Mirone, @Nicholaiii: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45137/result.json b/src/_tests/fixtures/45137/result.json index 25e52c602..3992f4d5e 100644 --- a/src/_tests/fixtures/45137/result.json +++ b/src/_tests/fixtures/45137/result.json @@ -17,7 +17,5 @@ "status": "@lirbank Thank you for submitting this PR!\n\n***This is a live comment which I will keep updated.***\n\n## 1 package in this PR\n\n* `mongodb` [on npm](https://www.npmjs.com/package/mongodb), [on unpkg](https://unpkg.com/browse/mongodb@latest/) (author is owner)\n - owner-approval: @LinusU\n - 1 removed owner: ✎@lirbank\n\n## Code Reviews\n\nThis PR can be merged once it's reviewed by a DT maintainer.\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----------------------\n... diagnostics scrubbed ..." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45627/mutations.json b/src/_tests/fixtures/45627/mutations.json index a1f0f320c..107221301 100644 --- a/src/_tests/fixtures/45627/mutations.json +++ b/src/_tests/fixtures/45627/mutations.json @@ -13,10 +13,11 @@ } }, { - "mutation": "mutation ($input: DeleteProjectCardInput!) {\n deleteProjectCard(input: $input) {\n __typename\n }\n}\n", + "mutation": "mutation ($input: MoveProjectCardInput!) {\n moveProjectCard(input: $input) {\n __typename\n }\n}\n", "variables": { "input": { - "cardId": "MDExOlByb2plY3RDYXJkNDA0NTk5NzM=" + "cardId": "MDExOlByb2plY3RDYXJkNDA0NTk5NzM=", + "columnId": "MDEzOlByb2plY3RDb2x1bW43NTUyOTI1" } } }, @@ -47,15 +48,6 @@ } } }, - { - "mutation": "mutation ($input: AddCommentInput!) {\n addComment(input: $input) {\n __typename\n }\n}\n", - "variables": { - "input": { - "subjectId": "MDExOlB1bGxSZXF1ZXN0NDM3NTIxMTQ2", - "body": "After a month, no one has requested merging the PR 😞. I'm going to assume that the change is not wanted after all, and will therefore close it.\n" - } - } - }, { "mutation": "mutation ($input: MergePullRequestInput!) {\n mergePullRequest(input: $input) {\n __typename\n }\n}\n", "variables": { @@ -66,13 +58,5 @@ "pullRequestId": "MDExOlB1bGxSZXF1ZXN0NDM3NTIxMTQ2" } } - }, - { - "mutation": "mutation ($input: ClosePullRequestInput!) {\n closePullRequest(input: $input) {\n __typename\n }\n}\n", - "variables": { - "input": { - "pullRequestId": "MDExOlB1bGxSZXF1ZXN0NDM3NTIxMTQ2" - } - } } ] diff --git a/src/_tests/fixtures/45627/result.json b/src/_tests/fixtures/45627/result.json index cf5822f83..9da093cfc 100644 --- a/src/_tests/fixtures/45627/result.json +++ b/src/_tests/fixtures/45627/result.json @@ -1,5 +1,5 @@ { - "projectColumn": "*REMOVE*", + "projectColumn": "Recently Merged", "labels": [ "Critical package", "Owner Approved", @@ -20,13 +20,8 @@ { "tag": "merge-offer", "status": "@spamshaker Everything looks good here. Great job! I am ready to merge this PR (at 15facc1) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@tkqubo, @bumbleblym, @bcherny, @tommytroylin, @mohsen1, @jcreamer898, @alan-agius4, @dennispg, @christophehurpeau, @ZSkycat, @johnnyreilly, @rwaskiewicz, @kuehlein, @grgur, @rubenspgcavalcante, @andersk, @ofhouse, @danielthank, @sasurau4, @dionshihk, @peterblazejewicz: you can do this too.)" - }, - { - "tag": "Unmerged:done", - "status": "After a month, no one has requested merging the PR 😞. I'm going to assume that the change is not wanted after all, and will therefore close it." } ], - "shouldClose": true, - "shouldMerge": true, - "shouldUpdateLabels": true + "shouldUpdateLabels": true, + "state": "merge" } diff --git a/src/_tests/fixtures/45836/result.json b/src/_tests/fixtures/45836/result.json index af1eff06b..5e8f4b999 100644 --- a/src/_tests/fixtures/45836/result.json +++ b/src/_tests/fixtures/45836/result.json @@ -15,7 +15,5 @@ "status": ":passport_control: Hi @mmorearty,\n\nI can't [accept a merge request](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-make-a-pull-request) until the PR has a green CI and was appropriately reviewed. I will let you know once that happens.\n\nThanks, and happy typing!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45884/result.json b/src/_tests/fixtures/45884/result.json index 782da8612..be5d19bea 100644 --- a/src/_tests/fixtures/45884/result.json +++ b/src/_tests/fixtures/45884/result.json @@ -19,7 +19,5 @@ "status": "@sgratzl Everything looks good here. Great job! I am ready to merge this PR (at 1dcf44a) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@phreed, @wy193777, @ypconstante, @janniclas, @cerberuser, @gsbelarus, @peterjferrarotto, @spaxe, @appleparan, @Veckodag: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45888/result.json b/src/_tests/fixtures/45888/result.json index 85f868d98..5f85d253a 100644 --- a/src/_tests/fixtures/45888/result.json +++ b/src/_tests/fixtures/45888/result.json @@ -18,7 +18,5 @@ "status": "πŸ”” @sampsonjoliver @andipaetzold @JiriBalcar @CodeLenny β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/45888/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45890/result.json b/src/_tests/fixtures/45890/result.json index 3882a1de2..9087cab59 100644 --- a/src/_tests/fixtures/45890/result.json +++ b/src/_tests/fixtures/45890/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @dimkirt β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/45890/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45946/result.json b/src/_tests/fixtures/45946/result.json index 31b5a4134..56865e84d 100644 --- a/src/_tests/fixtures/45946/result.json +++ b/src/_tests/fixtures/45946/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @rubensworks β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/45946/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45982/result.json b/src/_tests/fixtures/45982/result.json index eef24175d..c748fc390 100644 --- a/src/_tests/fixtures/45982/result.json +++ b/src/_tests/fixtures/45982/result.json @@ -9,7 +9,5 @@ "status": "@dasa β€” There was an error that prevented me from properly processing this PR:\n\n error parsing owners: At 1:1 : Expected /\\/\\/ Type definitions for (non-npm package )?/" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/45999/result.json b/src/_tests/fixtures/45999/result.json index 11c903a80..f0ebcb941 100644 --- a/src/_tests/fixtures/45999/result.json +++ b/src/_tests/fixtures/45999/result.json @@ -15,7 +15,5 @@ "status": "@alexpyzhianov Everything looks good here. Great job! I am ready to merge this PR (at 381a2a9) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@johnnyreilly, @bbenezech, @pzavolinsky, @digiguru, @ericanderson, @DovydasNavickas, @theruther4d, @guilhermehubner, @ferdaber, @jrakotoharisoa, @pascaloliv, @hotell, @franklixuefei, @Jessidhia, @saranshkataria, @lukyth, @eps1lon, @zieka, @dancerphil, @dimitropoulos, @disjukr, @vhfmag, @hellatan: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46008/result.json b/src/_tests/fixtures/46008/result.json index a5e7f0fca..c8f70f266 100644 --- a/src/_tests/fixtures/46008/result.json +++ b/src/_tests/fixtures/46008/result.json @@ -19,7 +19,5 @@ "status": "@risingBirdSong Everything looks good here. Great job! I am ready to merge this PR (at 3e19cb9) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@p5-types, @Zalastax: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46019/result.json b/src/_tests/fixtures/46019/result.json index 358e85eff..0015eda94 100644 --- a/src/_tests/fixtures/46019/result.json +++ b/src/_tests/fixtures/46019/result.json @@ -15,7 +15,5 @@ "status": "@peterblazejewicz Everything looks good here. Great job! I am ready to merge this PR (at ceca9f7) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46120/result.json b/src/_tests/fixtures/46120/result.json index 213b5d321..8d38efd41 100644 --- a/src/_tests/fixtures/46120/result.json +++ b/src/_tests/fixtures/46120/result.json @@ -20,7 +20,5 @@ "status": ":passport_control: Hi @reubenrybnik,\n\nI can't [accept a merge request](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-make-a-pull-request) until the PR has a green CI and was appropriately reviewed. I will let you know once that happens.\n\nThanks, and happy typing!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46191/result.json b/src/_tests/fixtures/46191/result.json index a35d26b22..4c6c4ca9c 100644 --- a/src/_tests/fixtures/46191/result.json +++ b/src/_tests/fixtures/46191/result.json @@ -23,7 +23,5 @@ "status": "@jordanoverbye The CI build failed! Please [review the logs for more information](https://github.com/DefinitelyTyped/DefinitelyTyped/commit/3cc81dbde57a1b0eda6f69f539fa49b8d420adff/checks?check_suite_id=938074936).\r\n\r\nOnce you've pushed the fixes, the build will automatically re-run. Thanks!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46196/result.json b/src/_tests/fixtures/46196/result.json index 7e4dada81..27ca63a03 100644 --- a/src/_tests/fixtures/46196/result.json +++ b/src/_tests/fixtures/46196/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @HeeL β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/46196/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46279/result.json b/src/_tests/fixtures/46279/result.json index 5d3d5d032..bef9cd50f 100644 --- a/src/_tests/fixtures/46279/result.json +++ b/src/_tests/fixtures/46279/result.json @@ -19,7 +19,5 @@ "status": "πŸ”” @pzingg β€” you're the only owner, but it would still be good if you find someone to [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/46279/files) in the next few days, otherwise a maintainer will look at it. (And if you do find someone, maybe even recruit them to be a second owner to make future changes easier...)" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46804/result.json b/src/_tests/fixtures/46804/result.json index 7280f12e1..53265ae6a 100644 --- a/src/_tests/fixtures/46804/result.json +++ b/src/_tests/fixtures/46804/result.json @@ -17,7 +17,5 @@ "status": "πŸ”” @hrngoode @adina-todoran @BreadAndRoses95 β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/46804/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/46879/result.json b/src/_tests/fixtures/46879/result.json index a9ffd1912..2cd5f8e25 100644 --- a/src/_tests/fixtures/46879/result.json +++ b/src/_tests/fixtures/46879/result.json @@ -13,7 +13,5 @@ "status": "πŸ”” @sudoplz @GiedriusGrabauskas β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/46879/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/47017-blessed-and-one-owner/result.json b/src/_tests/fixtures/47017-blessed-and-one-owner/result.json index c56a5cd40..6290231e1 100644 --- a/src/_tests/fixtures/47017-blessed-and-one-owner/result.json +++ b/src/_tests/fixtures/47017-blessed-and-one-owner/result.json @@ -10,7 +10,5 @@ "status": "@mastermatt Thank you for submitting this PR!\n\n***This is a live comment which I will keep updated.***\n\n## 2 packages in this PR\n\n* `express-serve-static-core` [on npm](https://www.npmjs.com/package/express-serve-static-core), [on unpkg](https://unpkg.com/browse/express-serve-static-core@latest/)\n - owner-approval: @dwrss\n* `express` [on npm](https://www.npmjs.com/package/express), [on unpkg](https://unpkg.com/browse/express@latest/)\n\n## Code Reviews\n\nThis PR can be merged once it's reviewed.\n\n## Status\n\n * βœ… No merge conflicts\n * βœ… Continuous integration tests have passed\n * ❌ All owners or a DT maintainer needs to approve changes which affect more than one package\n - βœ… express-serve-static-core\n - ❌ express\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 ..." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/47017-blessed-and-two-owner/result.json b/src/_tests/fixtures/47017-blessed-and-two-owner/result.json index 559955c63..a3736f2d0 100644 --- a/src/_tests/fixtures/47017-blessed-and-two-owner/result.json +++ b/src/_tests/fixtures/47017-blessed-and-two-owner/result.json @@ -16,7 +16,5 @@ "status": "@mastermatt Everything looks good here. Great job! I am ready to merge this PR (at dbe687d) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/47017-blessed/result.json b/src/_tests/fixtures/47017-blessed/result.json index 757992d11..e0e05b396 100644 --- a/src/_tests/fixtures/47017-blessed/result.json +++ b/src/_tests/fixtures/47017-blessed/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @borisyankov @19majkel94 @kacepe @micksatana @samijaber @aereal @JoseLion @dwrss @andoshin11 @CMUH @puneetar @dfrankland β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/47017/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/47017/result.json b/src/_tests/fixtures/47017/result.json index 298b16585..40368b002 100644 --- a/src/_tests/fixtures/47017/result.json +++ b/src/_tests/fixtures/47017/result.json @@ -14,7 +14,5 @@ "status": "πŸ”” @borisyankov @19majkel94 @kacepe @micksatana @samijaber @aereal @JoseLion @dwrss @andoshin11 @CMUH @puneetar @dfrankland β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/47017/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48216/result.json b/src/_tests/fixtures/48216/result.json index 34a015da4..86d424743 100644 --- a/src/_tests/fixtures/48216/result.json +++ b/src/_tests/fixtures/48216/result.json @@ -11,7 +11,5 @@ "status": "πŸ”” @innovation-team @rlbaxter β€” please [review this PR](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/48216/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." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48236/result.json b/src/_tests/fixtures/48236/result.json index 36a6bcdd4..b579dd47b 100644 --- a/src/_tests/fixtures/48236/result.json +++ b/src/_tests/fixtures/48236/result.json @@ -18,7 +18,6 @@ "status": "@jablko Everything looks good here. Great job! I am ready to merge this PR (at b4d71f6) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n\n(@climba03003: you can do this too.)" } ], - "shouldClose": false, - "shouldMerge": true, - "shouldUpdateLabels": true + "shouldUpdateLabels": true, + "state": "merge" } diff --git a/src/_tests/fixtures/48652-merge-offer/result.json b/src/_tests/fixtures/48652-merge-offer/result.json index 3811026c1..983935871 100644 --- a/src/_tests/fixtures/48652-merge-offer/result.json +++ b/src/_tests/fixtures/48652-merge-offer/result.json @@ -20,7 +20,5 @@ "status": "@RyanCavanaugh, @thorn0, @falsyvalues Thank you for reviewing this PR! The author has pushed new commits since your last review. Could you take another look and submit a fresh review?" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48652-prereq/result.json b/src/_tests/fixtures/48652-prereq/result.json index 2db4cd16c..b2ea52625 100644 --- a/src/_tests/fixtures/48652-prereq/result.json +++ b/src/_tests/fixtures/48652-prereq/result.json @@ -24,7 +24,5 @@ "status": ":passport_control: Hi @mgol,\n\nI can't [accept a merge request](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-make-a-pull-request) until the PR has a green CI and was appropriately reviewed. I will let you know once that happens.\n\nThanks, and happy typing!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48652-retract-merge-offer-and-prerequest/result.json b/src/_tests/fixtures/48652-retract-merge-offer-and-prerequest/result.json index 1896bf27d..b2a2c12e8 100644 --- a/src/_tests/fixtures/48652-retract-merge-offer-and-prerequest/result.json +++ b/src/_tests/fixtures/48652-retract-merge-offer-and-prerequest/result.json @@ -18,7 +18,5 @@ "status": ":passport_control: Hi @mgol,\n\nI can't [accept a merge request](https://github.com/DefinitelyTyped/DefinitelyTyped#user-content-make-a-pull-request) until the PR has a green CI and was appropriately reviewed. I will let you know once that happens.\n\nThanks, and happy typing!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48652-retract-merge-offer/result.json b/src/_tests/fixtures/48652-retract-merge-offer/result.json index d17016ac9..91f387998 100644 --- a/src/_tests/fixtures/48652-retract-merge-offer/result.json +++ b/src/_tests/fixtures/48652-retract-merge-offer/result.json @@ -14,7 +14,5 @@ "status": "@mgol One or more reviewers has requested changes. Please address their comments. I'll be back once they sign off or you've pushed new commits. Thank you!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48708/result.json b/src/_tests/fixtures/48708/result.json index b62db71c1..d181cc623 100644 --- a/src/_tests/fixtures/48708/result.json +++ b/src/_tests/fixtures/48708/result.json @@ -20,7 +20,5 @@ "status": "@martin-badin I haven't seen any activity on this PR in more than three weeks, and it still has problems that prevent it from being merged. The PR will be closed on Dec 12th (in a week) if the issues aren't addressed." } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/48945/result.json b/src/_tests/fixtures/48945/result.json index 122bdd213..dc794aadf 100644 --- a/src/_tests/fixtures/48945/result.json +++ b/src/_tests/fixtures/48945/result.json @@ -14,7 +14,5 @@ "status": "@google-api-typings-generator One or more reviewers has requested changes. Please address their comments. I'll be back once they sign off or you've pushed new commits. Thank you!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/49417/result.json b/src/_tests/fixtures/49417/result.json index cacd6c55c..1b45585bb 100644 --- a/src/_tests/fixtures/49417/result.json +++ b/src/_tests/fixtures/49417/result.json @@ -19,7 +19,5 @@ "status": "@tuuling Thank you for reviewing this PR! The author has pushed new commits since your last review. Could you take another look and submit a fresh review?" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/49548/result.json b/src/_tests/fixtures/49548/result.json index fba6c09c9..77f0a132a 100644 --- a/src/_tests/fixtures/49548/result.json +++ b/src/_tests/fixtures/49548/result.json @@ -19,7 +19,5 @@ "status": "Re-ping Β«anyone?Β»:\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!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/49575/result.json b/src/_tests/fixtures/49575/result.json index dda9bf826..e59083b95 100644 --- a/src/_tests/fixtures/49575/result.json +++ b/src/_tests/fixtures/49575/result.json @@ -18,7 +18,5 @@ "status": "@elibarzilay, @sandersn Thank you for reviewing this PR! The author has pushed new commits since your last review. Could you take another look and submit a fresh review?" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/49841/result.json b/src/_tests/fixtures/49841/result.json index 8adbe3576..95fb289b3 100644 --- a/src/_tests/fixtures/49841/result.json +++ b/src/_tests/fixtures/49841/result.json @@ -19,7 +19,5 @@ "status": "@shekari-ah The CI build failed! Please [review the logs for more information](https://github.com/DefinitelyTyped/DefinitelyTyped/commit/4849e8876b0ab7adc889ccc35b55fde6f0274837/checks?check_suite_id=1574877739).\r\n\r\nOnce you've pushed the fixes, the build will automatically re-run. Thanks!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/50429/result.json b/src/_tests/fixtures/50429/result.json index 57bbded15..b513b7940 100644 --- a/src/_tests/fixtures/50429/result.json +++ b/src/_tests/fixtures/50429/result.json @@ -19,7 +19,5 @@ "status": "@SaltyAom The CI build failed! Please [review the logs for more information](https://github.com/DefinitelyTyped/DefinitelyTyped/commit/8454d0853c273f9a20b08bd68cfd5c6b4f70c018/checks?check_suite_id=1778052567).\r\n\r\nOnce you've pushed the fixes, the build will automatically re-run. Thanks!" } ], - "shouldClose": false, - "shouldMerge": false, "shouldUpdateLabels": true } diff --git a/src/_tests/fixtures/50443/result.json b/src/_tests/fixtures/50443/result.json index 5f61307f3..572fcb5ea 100644 --- a/src/_tests/fixtures/50443/result.json +++ b/src/_tests/fixtures/50443/result.json @@ -15,7 +15,6 @@ "status": "@shockdevv Everything looks good here. Great job! I am ready to merge this PR (at 130c088) on your behalf.\n\nIf you'd like that to happen, please post a comment saying:\n\n> Ready to merge\n\nand I'll merge this PR almost instantly. Thanks for helping out! :heart:\n" } ], - "shouldClose": false, - "shouldMerge": true, - "shouldUpdateLabels": true + "shouldUpdateLabels": true, + "state": "merge" } diff --git a/src/compute-pr-actions.ts b/src/compute-pr-actions.ts index 3ef27ad8f..e8132fb81 100644 --- a/src/compute-pr-actions.ts +++ b/src/compute-pr-actions.ts @@ -52,8 +52,7 @@ export interface Actions { projectColumn?: ColumnName | "*REMOVE*"; labels: LabelName[]; responseComments: Comments.Comment[]; - shouldClose: boolean; - shouldMerge: boolean; + state?: "close" | "merge"; shouldUpdateLabels: boolean; } @@ -62,8 +61,6 @@ function createDefaultActions(): Actions { projectColumn: "Other", labels: [], responseComments: [], - shouldClose: false, - shouldMerge: false, shouldUpdateLabels: true, }; } @@ -72,8 +69,6 @@ function createEmptyActions(): Actions { return { labels: [], responseComments: [], - shouldClose: false, - shouldMerge: false, shouldUpdateLabels: false, }; } @@ -327,7 +322,7 @@ export function process(prInfo: BotResult, (info.tooManyOwners || info.hasMultiplePackages) ? [] : info.otherOwners, headCommitAbbrOid)); if (info.hasValidMergeRequest) { - actions.shouldMerge = true; + actions.state = "merge"; actions.projectColumn = "Recently Merged"; } else { actions.projectColumn = "Waiting for Author to Merge"; @@ -341,12 +336,14 @@ export function process(prInfo: BotResult, } } - if (!actions.shouldMerge && info.mergeRequestUser) { - post(Comments.WaitUntilMergeIsOK(info.mergeRequestUser, headCommitAbbrOid, urls.workflow)); - } + if (!actions.state) { + if (info.mergeRequestUser) { + post(Comments.WaitUntilMergeIsOK(info.mergeRequestUser, headCommitAbbrOid, urls.workflow)); + } - // Timeline-related actions - info.staleness?.doTimelineActions(actions); + // Timeline-related actions + info.staleness?.doTimelineActions(actions); + } return actions; } @@ -369,7 +366,7 @@ function makeStaleness(now: Date, author: string, otherOwners: string[]) { // cu } if (state === "done") { if (doneColumn === "CLOSE") { - actions.shouldClose = true; + actions.state = "close"; actions.projectColumn = "*REMOVE*"; } else { actions.projectColumn = doneColumn; diff --git a/src/execute-pr-actions.ts b/src/execute-pr-actions.ts index d89d9fcc6..390dddf04 100644 --- a/src/execute-pr-actions.ts +++ b/src/execute-pr-actions.ts @@ -102,19 +102,18 @@ function getMutationsForCommentRemovals(actions: Actions, botComments: ParsedCom } function getMutationsForChangingPRState(actions: Actions, pr: PR_repository_pullRequest) { - return [ - actions.shouldMerge - ? createMutation("mergePullRequest", { + if (!actions.state) return []; + switch (actions.state) { + case "close": + return [createMutation("closePullRequest", { pullRequestId: pr.id })]; + case "merge": + return [createMutation("mergePullRequest", { commitHeadline: `πŸ€– Merge PR #${pr.number} ${pr.title} by @${pr.author?.login ?? "(ghost)"}`, expectedHeadOid: pr.headRefOid, mergeMethod: "SQUASH", pullRequestId: pr.id, - }) - : null, - actions.shouldClose - ? createMutation("closePullRequest", { pullRequestId: pr.id }) - : null, - ]; + })]; + } } async function getProjectBoardColumnIdByName(name: string): Promise {