From cb3368d5dfea2dba02aee244cf88a6e4e3fd9489 Mon Sep 17 00:00:00 2001 From: pat-s Date: Fri, 26 Jul 2024 17:36:49 +0200 Subject: [PATCH] try s3fs branch --- .woodpecker/build.yaml | 3 ++- R/packages_index.R | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index af07143..a024ec1 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -33,12 +33,13 @@ steps: # rscript_startup arg: required to pass down global option to future workers https://github.com/HenrikBengtsson/future/issues/134#issuecomment-2245666169 - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/arm64-r-binaries.git && cd arm64-r-binaries - rm -rf /mnt/cache/R-pkgs/00LOCK-arm64-r-binaries + - R -q -e 'pak::pak("dyfanjones/s3fs@file_upload")' - R -q -e 'install.packages(".", repos = NULL, quiet = FALSE); packageVersion("rBinaries")' # manually install some packages into the cache so that some builds don't fail # Hmisc -> ABCanalysis # - R -q -e 'pak::pak("Hmisc")' - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/binaries - - R -q -e 'options(crayon.enabled = TRUE, Ncpus = 4, future.globals.onReference = "error"); pkgs = tools::CRAN_package_db()[[1]][7:10]; library(rBinaries); future::plan("multisession", workers = 4, rscript_startup = quote(options(crayon.enabled = TRUE))); foo = lapply(pkgs, function(x) build_binary_package(x, build_for_minor=FALSE, debug = FALSE, force = TRUE))' + - R -q -e 'options(crayon.enabled = TRUE, Ncpus = 4, future.globals.onReference = "error"); pkgs = tools::CRAN_package_db()[[1]][10:15]; library(rBinaries); future::plan("multisession", workers = 4, rscript_startup = quote(options(crayon.enabled = TRUE))); foo = lapply(pkgs, function(x) build_binary_package(x, build_for_minor=FALSE, debug = FALSE, force = TRUE))' backend_options: kubernetes: resources: diff --git a/R/packages_index.R b/R/packages_index.R index 772b037..167fe2c 100644 --- a/R/packages_index.R +++ b/R/packages_index.R @@ -81,8 +81,8 @@ upload_package_index <- function( ) dummy <- purrr::walk2( - sprintf("%s/%s", local_bin_dir, c("PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz")), - sprintf("%s/%s", remote_bin_dir, c("PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz")), + sprintf("%s/%s", local_bin_dir, 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) ) @@ -94,8 +94,8 @@ upload_package_index <- function( cli::cli_alert_warning("DEBUG: PACKAGES UPLOAD remote dir: {pkgs_upload_remote}") } - s3 <- paws.storage::s3(endpoint = endpoint, region = region) - s3$put_object(Body = pkgs_upload_local, Bucket = bucket, Key = "__linux__/rhel9/latest/src/contrib/PACKAGES") + # s3 <- paws.storage::s3(endpoint = endpoint, region = region) + # s3$put_object(Body = pkgs_upload_local, Bucket = bucket, Key = "__linux__/rhel9/latest/src/contrib/PACKAGES") return(invisible(TRUE)) }