diff --git a/R/archive_packages.R b/R/archive_packages.R index 8e3e0d1..f20e47d 100644 --- a/R/archive_packages.R +++ b/R/archive_packages.R @@ -42,6 +42,11 @@ archive_package <- function( remote_bin_dir <- sprintf("%s/%s/%s/%s/latest/src/contrib", bucket, arch, codename, r_minor_version) } + # suppress progressr output here + progressr::handlers("void") + # don't parallelise + future::plan("sequential") + files <- s3fs::s3_dir_ls(remote_bin_dir) foo <- lapply(package_name, function(.x) { @@ -69,10 +74,6 @@ archive_package <- function( } } cli::cli_alert("{.fun archive_package}: Archiving {.field {basename(old_versions)}}, keeping {.field {basename(all_versions[index])}}.") - # suppress progressr output here - progressr::handlers("void") - # don't parallelise - future::plan("sequential") s3fs::s3_file_move(old_versions, sprintf("%s/Archive/%s/%s", remote_bin_dir, .x, basename(old_versions)), overwrite = TRUE) cli::cli_alert_success("{.fun archive_package}: Successfully archived package {.pkg {.x}}.") if (!is.null(pause)) { diff --git a/R/build_binaries.R b/R/build_binaries.R index 3b8f8d1..0de5120 100644 --- a/R/build_binaries.R +++ b/R/build_binaries.R @@ -128,9 +128,10 @@ build_binary_package <- function(package_name, tag = NULL, codename = NULL, cli::cli_alert("Execution time ({.pkg {package_name[[1]]}}) ({length(tag)} tags): {.strong {total_build_time} {units(difftime(Sys.time(), t1))}}.") cli::cli_h2("Uploading ({.pkg {package_name[1]}})") - out <- progressr::with_progress({ - p <- progressr::progressor(along = tag) - future.apply::future_mapply(function(x, y) { + # out <- progressr::with_progress({ + # p <- progressr::progressor(along = tag) + # future.apply::future_mapply(function(x, y) { + mapply(function(x, y) { tryCatch( { p() @@ -140,7 +141,7 @@ build_binary_package <- function(package_name, tag = NULL, codename = NULL, message(sprintf("Error in uploading package %s with tag %s: %s", x, y, e)) } ) - }, package_name, tag, future.seed = TRUE) + # }, package_name, tag, future.seed = TRUE) }) if (archive) {