From d1c8b8ba4ddea755be4e514a95c4f5b7b6722631 Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 24 Jul 2024 19:28:23 +0200 Subject: [PATCH] improve log --- .woodpecker/build.yaml | 2 +- R/build_binaries.R | 10 +++++----- R/upload.R | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 2276b22..f8320f3 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -24,7 +24,7 @@ steps: # download latest package version (avoid having to rebuild image every time) - git clone https://pat-s:$$git_ro_token@git.devxy.io/devxy/arm64-r-binaries.git && cd arm64-r-binaries - R -q -e 'install.packages(".", repos = NULL, quiet = TRUE); packageVersion("rBinaries")' - - R -q -e 'options(crayon.enabled = TRUE, Ncpus = 2); pkgs = tools::CRAN_package_db()[[1]][1:2]; library(rBinaries); future::plan("multicore", workers = 2); lapply(pkgs, function(x) build_binary_package(x, build_for_minor=FALSE, debug = FALSE, force = TRUE))' + - R -q -e 'options(crayon.enabled = TRUE, Ncpus = 2); pkgs = tools::CRAN_package_db()[[1]][1:2]; library(rBinaries); future::plan("multicore", workers = 2); 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/build_binaries.R b/R/build_binaries.R index 5e292e8..e165302 100644 --- a/R/build_binaries.R +++ b/R/build_binaries.R @@ -131,7 +131,7 @@ build_single_tag <- function( platform, dir_out_bin, local_clone_dir) { - cli::cli_alert_info("{.fun build_single_tag}: 1. Cloning package {.pkg {package_name}} with tag {.field {tag}}.") + cli::cli_alert_info("{.fun build_single_tag}: (1/4) Cloning package {.pkg {package_name}} with tag {.field {tag}}.") local_clone_dir_single <- sprintf("%s/%s_%s", local_clone_dir, package_name, tag) @@ -142,9 +142,9 @@ build_single_tag <- function( )) if (file.exists(sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag))) { - cli::cli_alert_info("{.fun build_single_tag}: 2. Tarball for package {.pkg {package_name}} with tag {.field {tag}} already exists. Skipping build.") + cli::cli_alert_info("{.fun build_single_tag}: (2/4). Tarball for package {.pkg {package_name}} with tag {.field {tag}} already exists. Skipping build.") } else { - cli::cli_alert_info("{.fun build_single_tag}: 2. Building package {.pkg {package_name}} with tag {.field {tag}}.") + cli::cli_alert_info("{.fun build_single_tag}: (2/4). Building package {.pkg {package_name}} with tag {.field {tag}}.") t1 <- Sys.time() dump <- pkgbuild::build( @@ -154,7 +154,7 @@ build_single_tag <- function( ) if (!file.exists(sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag))) { - cli::cli_alert_info('{.fun build_single_tag}: 3. Moving package from {.path {sprintf("%s/%s*.tar.gz", dir_out_bin, package_name)}} to {.path {sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag)}}') + cli::cli_alert_info('{.fun build_single_tag}: (3/4). Moving package from {.path {sprintf("%s/%s*.tar.gz", dir_out_bin, package_name)}} to {.path {sprintf("%s/%s_%s.tar.gz", dir_out_bin, package_name, tag)}}') # remove _aarch64-unknown-linux-gnu part in filename system2("rsync", args = c( sprintf("%s/%s_%s*.tar.gz", dir_out_bin, package_name, tag), @@ -165,7 +165,7 @@ build_single_tag <- function( } unlink(sprintf("%s/%s_%s_R*.tar.gz", dir_out_bin, package_name, tag)) - cli::cli_alert_info("{.fun build_single_tag}: 4. Removing {.path {local_clone_dir_single}}.") + cli::cli_alert_info("{.fun build_single_tag}: (4/4) Removing {.path {local_clone_dir_single}}.") unlink(local_clone_dir_single, force = TRUE, recursive = TRUE) total_build_time <- round(Sys.time() - t1, 2) diff --git a/R/upload.R b/R/upload.R index 01ed5d2..915d48c 100644 --- a/R/upload.R +++ b/R/upload.R @@ -40,13 +40,13 @@ upload_single_binary_to_s3 <- function( sprintf("%s/%s", remote_bin_path, tarball_name) ) } else if (exists && force) { - cli::cli_alert_info("{.fun upload_single_binary_to_s3}: Force uploading package {.pkg {package_name}} {.path {tag}} because {.code force = TRUE} was set.") + cli::cli_alert_info("{.fun upload_single_binary_to_s3}: Force uploading package {.pkg {package_name}} {.field {tag}} because {.code force = TRUE} was set.") s3fs::s3_file_upload( sprintf("%s/%s", local_bin_path, tarball_name), sprintf("%s/%s", remote_bin_path, tarball_name), overwrite = TRUE ) } else if (exists && !force) { - cli::cli_alert_info("{.fun upload_single_binary_to_s3}: Package {.pkg {package_name}} {.path {tag}} already exists in S3. Skipping upload.") + cli::cli_alert_info("{.fun upload_single_binary_to_s3}: Package {.pkg {package_name}} {.field {tag}} already exists in S3. Skipping upload.") } }