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

new build image + index upload fixes

Browse source
This commit is contained in:
Patrick Schratz 2024-07-27 22:38:58 +02:00
commit 6f1b8dfa8d
Signed by: pat-s
GPG key ID: 3C6318841EF78925
1 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

20
R/packages_index.R
View file

@ -54,11 +54,11 @@ upload_package_index <- function(
endpoint = "https://s3.eu-central-003.backblazeb2.com",
region = "eu-central-003",
bucket = "devxy-arm64-r-binaries",
local_build_root = "/mnt/cache/binaries/",
local_build_root = ".",
codename = NULL, r_minor_version = NULL,
build_for_minor = FALSE,
debug = FALSE) {
cli::cli_alert("{.fun create_package_index}: Uploading PACKAGES* files to S3.")
cli::cli_alert("{.fun upload_package_index}: Uploading PACKAGES* files to S3.")
codename <- set_codename(codename)
if (is.null(r_minor_version)) {
@ -66,11 +66,11 @@ upload_package_index <- function(
}
if (!build_for_minor) {
local_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib/", local_build_root, codename)
remote_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib/", bucket, codename)
local_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib", local_build_root, codename)
remote_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib", bucket, codename)
} else {
dir_out_bin <- sprintf("%s/__linux__/%s/%s/latest/src/contrib/", local_build_root, codename, r_minor_version)
remote_bin_dir <- sprintf("%s/__linux__/%s/%s/latest/src/contrib/", bucket, codename, r_minor_version)
dir_out_bin <- sprintf("%s/__linux__/%s/%s/latest/src/contrib", local_build_root, codename, r_minor_version)
remote_bin_dir <- sprintf("%s/__linux__/%s/%s/latest/src/contrib", bucket, codename, r_minor_version)
}
s3fs::s3_file_system(
@ -82,18 +82,18 @@ upload_package_index <- function(
pkg_count = length(s3fs::s3_dir_ls(remote_bin_dir)) - 4
t1 <- Sys.time()
cranlike::update_PACKAGES(remote_bin_dir)
cranlike::update_PACKAGES(sprintf("s3://%s", remote_bin_dir))
total_build_time <- round(Sys.time() - t1, 2)
cli::cli_alert("Time updating PACKAGES index for {.field {pkg_count}} packages: {.strong {total_build_time} {units(difftime(Sys.time(), t1))}}.")
purrr::walk2(
sprintf("%s/%s", local_bin_dir, c("PACKAGES", "PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz")),
c("PACKAGES", "PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz"),
sprintf("%s/%s", remote_bin_dir, c("PACKAGES", "PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz")),
\(x, y) s3fs::s3_file_upload(x, y, overwrite = TRUE)
)
pkgs_upload_local <- sprintf("%sPACKAGES", local_bin_dir)
pkgs_upload_remote <- sprintf("%sPACKAGES", remote_bin_dir)
# pkgs_upload_local <- sprintf("%sPACKAGES", local_bin_dir)
# pkgs_upload_remote <- sprintf("%sPACKAGES", remote_bin_dir)
# if (debug) {
# cli::cli_alert_warning("DEBUG: PACKAGES UPLOAD local dir: {pkgs_upload_local}")