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

add missing else{}, allow setting arch manually

Browse source
This commit is contained in:
Patrick Schratz 2024-09-23 14:09:35 +02:00
commit 1ddf365208
Signed by: pat-s
GPG key ID: 3C6318841EF78925
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
R/archive_packages.R
View file

@ -3,6 +3,7 @@
#' @export #' @export
#' @examples #' @examples
#' archive_package("AATtools", codename = "rhel9") #' archive_package("AATtools", codename = "rhel9")
#' archive_package("asbio", codename = "rhel9", arch = "amd64")
#' #'
archive_package <- function( archive_package <- function(
package_name, package_name,
@ -13,7 +14,8 @@ archive_package <- function(
endpoint = "https://s3.eu-central-003.backblazeb2.com", endpoint = "https://s3.eu-central-003.backblazeb2.com",
region = "eu-central-003", region = "eu-central-003",
bucket = "devxy-arm64-r-binaries", bucket = "devxy-arm64-r-binaries",
pause = NULL) { pause = NULL,
arch = NULL) {
s3fs::s3_file_system( s3fs::s3_file_system(
aws_access_key_id = Sys.getenv("AWS_ACCESS_KEY_ID"), aws_access_key_id = Sys.getenv("AWS_ACCESS_KEY_ID"),
aws_secret_access_key = Sys.getenv("AWS_SECRET_ACCESS_KEY"), aws_secret_access_key = Sys.getenv("AWS_SECRET_ACCESS_KEY"),
@ -23,12 +25,14 @@ archive_package <- function(
codename <- set_codename(codename) codename <- set_codename(codename)
local_arch = Sys.info()[["machine"]] if (is.null(arch)) {
local_arch <- Sys.info()[["machine"]]
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) { if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
arch <- "arm64" arch <- "arm64"
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) { } else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
arch <- "amd64" arch <- "amd64"
} }
}
if (!build_for_minor) { if (!build_for_minor) {
local_bin_dir <- set_bin_path(r_minor_version, build_for_minor, local_build_root, codename) local_bin_dir <- set_bin_path(r_minor_version, build_for_minor, local_build_root, codename)
@ -74,8 +78,9 @@ archive_package <- function(
if (!is.null(pause)) { if (!is.null(pause)) {
Sys.sleep(pause) Sys.sleep(pause)
} }
} } else {
cli::cli_alert("{.fun archive_package}: Skipping {.pkg {.x}} as only one package versions exists.") cli::cli_alert("{.fun archive_package}: Skipping {.pkg {.x}} as only one package versions exists.")
}
}) })
return(invisible(TRUE)) return(invisible(TRUE))