Add check_mac_devel()

Author: nfrerebeau

NAMESPACE

@@ -13,6 +13,7 @@ export(build_vignettes)
 export(check)
 export(check_built)
 export(check_dep_version)
+export(check_mac_devel)
 export(check_mac_release)
 export(check_man)
 export(check_rhub)

NEWS.md

@@ -8,6 +8,8 @@
 * `test_coverage_active_file()` now reports if any tests failed and does
   a better job of executing snapshot comparisons.
 
+* New `check_mac_devel()` function to check a package using the macOS builder at https://mac.r-project.org/macbuilder/submit.html (@nfrerebeau, #2507)
+
 # devtools 2.4.5
 
 * `check(cleanup =)` was deprecated in devtools v1.11.0 (2016-04-12) and was

R/check-mac.R

@@ -10,12 +10,37 @@
 #'   the package.
 #' @family build functions
 #' @return The url with the check results (invisibly)
+#' @name check_mac
+NULL
+
+#' @describeIn check_mac Check package on the development version of R.
+#' @export
+check_mac_devel <- function(pkg = ".", dep_pkgs = character(), args = NULL, manual = TRUE, quiet = FALSE, ...) {
+  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+
+  check_mac(
+    pkg = pkg, version = "R-devel", dep_pkgs = dep_pkgs,
+    args = args, manual = manual, quiet = quiet, ...
+  )
+}
+
+#' @describeIn check_mac Check package on the released version of R.
 #' @export
 check_mac_release <- function(pkg = ".", dep_pkgs = character(), args = NULL, manual = TRUE, quiet = FALSE, ...) {
   check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
 
+  check_mac(
+    pkg = pkg, version = "R-release", dep_pkgs = dep_pkgs,
+    args = args, manual = manual, quiet = quiet, ...
+  )
+}
+
+check_mac <- function(pkg = ".", version = c("R-devel", "R-release"),
+                      dep_pkgs = character(), args = NULL, manual = TRUE, quiet = FALSE, ...) {
   pkg <- as.package(pkg)
 
+  version <- match.arg(version, several.ok = FALSE)
+
   if (!quiet) {
     cli::cli_inform(c(
       "Building macOS version of {.pkg {pkg$package}} ({pkg$version})",
@@ -24,24 +49,25 @@ check_mac_release <- function(pkg = ".", dep_pkgs = character(), args = NULL, ma
   }
 
   built_path <- pkgbuild::build(pkg$path, tempdir(),
-    args = args,
-    manual = manual, quiet = quiet, ...
+                                args = args,
+                                manual = manual, quiet = quiet, ...
   )
 
   dep_built_paths <- character()
   for (i in seq_along(dep_pkgs)) {
     dep_pkg <- as.package(dep_pkgs[[i]])$path
     dep_built_paths[[i]] <- pkgbuild::build(dep_pkg, tempdir(),
-      args = args,
-      manual = manual, quiet = quiet, ...
+                                            args = args,
+                                            manual = manual, quiet = quiet, ...
     )
   }
   on.exit(file_delete(c(built_path, dep_built_paths)), add = TRUE)
 
   url <- "https://mac.r-project.org/macbuilder/v1/submit"
 
   rlang::check_installed("httr")
-  body <- list(pkgfile = httr::upload_file(built_path))
+  body <- list(pkgfile = httr::upload_file(built_path),
+               rflavor = tolower(version))
 
   if (length(dep_built_paths) > 0) {
     uploads <- lapply(dep_built_paths, httr::upload_file)
@@ -50,11 +76,11 @@ check_mac_release <- function(pkg = ".", dep_pkgs = character(), args = NULL, ma
   }
 
   res <- httr::POST(url,
-    body = body,
-    headers = list(
-      "Content-Type" = "multipart/form-data"
-    ),
-    encode = "multipart"
+                    body = body,
+                    headers = list(
+                      "Content-Type" = "multipart/form-data"
+                    ),
+                    encode = "multipart"
   )
 
   httr::stop_for_status(res, task = "Uploading package")