From 284d298916371d7826b14c97bb0fd3edd3b7cdcb Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 28 Aug 2024 18:29:52 +0200 Subject: [PATCH] smarter removal feature --- .woodpecker/process_cran_updates.yaml | 2 +- R/process_cran_updates.R | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.woodpecker/process_cran_updates.yaml b/.woodpecker/process_cran_updates.yaml index f049976..7d23f82 100644 --- a/.woodpecker/process_cran_updates.yaml +++ b/.woodpecker/process_cran_updates.yaml @@ -41,7 +41,7 @@ steps: # more complicated system dependencies which pak cannot resolve - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages # set additional repos: important as otherwise some packages cannot be resolved (e.g. INLA). Also: setting our own binary repos so we can make use of them for dep installation at some point - - R -q -e 'options(crayon.enabled = TRUE, Ncpus = 4, future.globals.onReference = "error", repos = structure(c(getOption("repos"),INLA="https://inla.r-inla-download.org/R/stable"))); pkgs = tools::CRAN_package_db()[[1]][${BLOCK}]; pkgs = setdiff(pkgs, c("biplotbootGUI", "cncaGUI", "dynBiplotGUI", "ade4TkGUI", "BlockmodelingGUI", "cncaGUI", "EventDetectGUI", "irtGUI", "KappaGUI", "magickGUI", "miniGUI", "multibiplotGUI", "TextMiningGUI", "later", "RclusTool", "Rcmdr", "RcmdrMisc", "RcmdrPlugin.aRnova", "RcmdrPlugin.BiclustGUI", "RcmdrPlugin.BWS1", "RcmdrPlugin.BWS2", "RcmdrPlugin.BWS3", "RcmdrPlugin.cpd", "RcmdrPlugin.DCCV", "RcmdrPlugin.DCE", "RcmdrPlugin.depthTools", "RcmdrPlugin.DoE", "RcmdrPlugin.EACSPIR", "RcmdrPlugin.EBM", "RcmdrPlugin.EcoVirtual", "RcmdrPlugin.Export", "RcmdrPlugin.EZR", "RcmdrPlugin.FactoMineR", "RcmdrPlugin.GWRM", "RcmdrPlugin.HH", "RcmdrPlugin.KMggplot2", "RcmdrPlugin.MA", "RcmdrPlugin.MPAStats", "RcmdrPlugin.NMBU", "RcmdrPlugin.orloca", "RcmdrPlugin.PcaRobust", "RcmdrPlugin.RiskDemo", "RcmdrPlugin.RMTCJags", "RcmdrPlugin.ROC", "RcmdrPlugin.sos" , "RcmdrPlugin.survival", "RcmdrPlugin.TeachingDemos", "RcmdrPlugin.TeachStat", "RcmdrPlugin.temis", "RcmdrPlugin.UCA" , "RcmdrPlugin.WorldFlora", "sf", "StratigrapheR", "tcltk2", "TVMM", "uHMM")); library(rBinaries); future::plan("sequential"); process_cran_updates(interval = lubridate::today() - 1, platform = "${PLATFORM}")' + - R -q -e 'options(crayon.enabled = TRUE, Ncpus = 4, future.globals.onReference = "error", repos = structure(c(getOption("repos"),INLA="https://inla.r-inla-download.org/R/stable"))); pkgs = tools::CRAN_package_db()[[1]][${BLOCK}]; pkgs = setdiff(pkgs, c("biplotbootGUI", "cncaGUI", "dynBiplotGUI", "ade4TkGUI", "BlockmodelingGUI", "cncaGUI", "EventDetectGUI", "irtGUI", "KappaGUI", "magickGUI", "miniGUI", "multibiplotGUI", "TextMiningGUI", "later", "RclusTool", "Rcmdr", "RcmdrMisc", "RcmdrPlugin.aRnova", "RcmdrPlugin.BiclustGUI", "RcmdrPlugin.BWS1", "RcmdrPlugin.BWS2", "RcmdrPlugin.BWS3", "RcmdrPlugin.cpd", "RcmdrPlugin.DCCV", "RcmdrPlugin.DCE", "RcmdrPlugin.depthTools", "RcmdrPlugin.DoE", "RcmdrPlugin.EACSPIR", "RcmdrPlugin.EBM", "RcmdrPlugin.EcoVirtual", "RcmdrPlugin.Export", "RcmdrPlugin.EZR", "RcmdrPlugin.FactoMineR", "RcmdrPlugin.GWRM", "RcmdrPlugin.HH", "RcmdrPlugin.KMggplot2", "RcmdrPlugin.MA", "RcmdrPlugin.MPAStats", "RcmdrPlugin.NMBU", "RcmdrPlugin.orloca", "RcmdrPlugin.PcaRobust", "RcmdrPlugin.RiskDemo", "RcmdrPlugin.RMTCJags", "RcmdrPlugin.ROC", "RcmdrPlugin.sos" , "RcmdrPlugin.survival", "RcmdrPlugin.TeachingDemos", "RcmdrPlugin.TeachStat", "RcmdrPlugin.temis", "RcmdrPlugin.UCA" , "RcmdrPlugin.WorldFlora", "sf", "StratigrapheR", "tcltk2", "TVMM", "uHMM")); library(rBinaries); future::plan("sequential"); process_cran_updates(interval = lubridate::today() - 2, platform = "${PLATFORM}")' backend_options: kubernetes: ### PROD diff --git a/R/process_cran_updates.R b/R/process_cran_updates.R index e1ba5fa..0c38d44 100644 --- a/R/process_cran_updates.R +++ b/R/process_cran_updates.R @@ -24,9 +24,9 @@ process_cran_updates <- function( updated_pkgs <- get_updated_cran_packages(interval) new_pkgs <- get_new_cran_packages(interval) - cli::cli_alert_success("{.fun process_cran_updates}: Updated packages:") + cli::cli_alert_success("{.fun process_cran_updates}: Updated packages:") print(updated_pkgs) - cli::cli_alert_success("{.fun process_cran_updates}: New packages:") + cli::cli_alert_success("{.fun process_cran_updates}: New packages:") print(new_pkgs) all_pkgs <- dplyr::bind_rows(updated_pkgs, new_pkgs) @@ -35,7 +35,7 @@ process_cran_updates <- function( if (prune) { removed_pkgs <- get_removed_cran_packages(interval) - cli::cli_alert_success("{.fun process_cran_updates}: Removed packages:") + cli::cli_alert_success("{.fun process_cran_updates}: Removed packages:") print(removed_pkgs) s3fs::s3_file_system( @@ -58,7 +58,11 @@ process_cran_updates <- function( purrr::walk(removed_pkgs$name, ~ { cli::cli_alert("{.fun process_cran_updates}: Removing package {.pkg {.x}} from S3.") files_filtered <- grep(sprintf("%s_", .x), files, value = TRUE) - s3fs::s3_file_delete(files_filtered) + if (length(files_filtered > 0)) { + s3fs::s3_file_delete(files_filtered) + } else { + cli::cli_alert("{.fun process_cran_updates}: No tarballs found for package {.pkg {.x}} - already removed?") + } cli::cli_alert_success("{.fun process_cran_updates}: Successfully removed {.pkg {basename(files_filtered)}} from S3.") })