variable renaming

This commit is contained in:
Patrick Schratz 2024-07-24 22:09:19 +02:00
commit 3fbc5ae88e
Signed by: pat-s
GPG key ID: 3C6318841EF78925
2 changed files with 9 additions and 9 deletions

View file

@ -29,7 +29,7 @@ set_codename <- function(codename) {
#' Helper function to set the path for binary package outputs
#' @export
set_bin_path <- function(
r_version_minor, build_for_minor,
r_minor_version, build_for_minor,
local_build_root, codename) {
if (!build_for_minor) {
path <- sprintf(
@ -39,7 +39,7 @@ set_bin_path <- function(
} else {
path <- sprintf(
"%s/__linux__/%s/%s/latest/src/contrib",
local_build_root, codename, r_version_minor
local_build_root, codename, r_minor_version
)
}
return(path)

View file

@ -6,17 +6,17 @@ upload_single_binary_to_s3 <- function(
bucket = "devxy-arm64-r-binaries",
local_build_root = "/root", codename = NULL,
package_name, tag,
r_version_minor = NULL, build_for_minor = FALSE,
r_minor_version = NULL, build_for_minor = FALSE,
force = FALSE,
debug = FALSE) {
codename <- set_codename(codename)
if (is.null(r_version_minor)) {
r_version_minor <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
if (is.null(r_minor_version)) {
r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
}
local_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = local_build_root, codename)
remote_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = bucket, codename)
local_bin_path <- set_bin_path(r_minor_version, build_for_minor, local_build_root = local_build_root, codename)
remote_bin_path <- set_bin_path(r_minor_version, build_for_minor, local_build_root = bucket, codename)
if (debug) {
cli::cli_alert_danger("DEBUG: dir_out_bin: {dir_out_bin}, codename: {codename}")