Merge retries and testthat

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: r.releases.internals
 Title: Internal Infrastructure for An R Universe of Package Releases
 Description: Internal infrastructure for an R universe of package releases.
-Version: 0.0.15
+Version: 0.0.16
 License: MIT + file LICENSE
 URL: https://github.com/r-releases/r.releases.internals
 BugReports: https://github.com/r-releases/r.releases.internals/issues
@@ -33,6 +33,8 @@ Imports:
   pkgsearch,
   utils,
   vctrs
+Suggests: 
+  testthat (>= 3.0.0)
 Encoding: UTF-8
 Language: en-US
 Config/testthat/edition: 3

NEWS.md

@@ -1,3 +1,8 @@
+# r.releases.internals 0.0.16
+
+* Retry failed merge attempts.
+* Use `testthat`
+
 # r.releases.internals 0.0.15
 
 * Add explicit check that each contribution has only 1 line.

R/review_pull_request.R

@@ -184,23 +184,27 @@ pull_request_merge <- function(owner, repo, number) {
       .limit = Inf
     )
     labels <- pull_request_labels(pull_request)
-    if (!(label_manual_review %in% labels)) {
+    if (!(label_retry_review %in% labels)) {
       gh::gh(
         "POST /repos/:owner/:repo/issues/:number/comments",
         owner = owner,
         repo = repo,
         number = number,
         body = paste0(
-          "There was a problem merging pull request ",
-          number
+          "Pull request ",
+          number,
+          " is approved in its current state, ",
+          "but the bot encountered an error trying to merge it. ",
+          "The bot will repeat the review and retry the merge ",
+          "next time it reviews pull requests."
         )
       )
       gh::gh(
         "POST /repos/:owner/:repo/issues/:number/labels",
         owner = owner,
         repo = repo,
         number = number,
-        labels = list(label_manual_review)
+        labels = list(label_retry_review)
       )
     }
   } else {
@@ -231,3 +235,5 @@ pull_request_labels <- function(pull_request) {
 }
 
 label_manual_review <- "manual-review"
+
+label_retry_review <- "retry-review"