devxy/build-cran-binaries
Watch
1
0
Fork
You've already forked build-cran-binaries
 0
Code Issues 11 Pull requests Releases Activity

don't parallelise upload

Browse source
This commit is contained in:
Patrick Schratz 2024-09-23 14:09:46 +02:00
commit 2eed67c54a
Signed by: pat-s
GPG key ID: 3C6318841EF78925
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
R/archive_packages.R
View file

@ -42,6 +42,11 @@ archive_package <- function(
remote_bin_dir <- sprintf("%s/%s/%s/%s/latest/src/contrib", bucket, arch, codename, r_minor_version) 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) files <- s3fs::s3_dir_ls(remote_bin_dir)
foo <- lapply(package_name, function(.x) { 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])}}.") 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) 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}}.") cli::cli_alert_success("{.fun archive_package}: Successfully archived package {.pkg {.x}}.")
if (!is.null(pause)) { if (!is.null(pause)) {

9
R/build_binaries.R
View file

@ -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_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]}})") cli::cli_h2("Uploading ({.pkg {package_name[1]}})")
out <- progressr::with_progress({ # out <- progressr::with_progress({
p <- progressr::progressor(along = tag) # p <- progressr::progressor(along = tag)
future.apply::future_mapply(function(x, y) { # future.apply::future_mapply(function(x, y) {
mapply(function(x, y) {
tryCatch( tryCatch(
{ {
p() 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)) 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) { if (archive) {