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

account for architecture when building and uploading

Browse source
This commit is contained in:
Patrick Schratz 2024-09-05 13:44:02 +02:00
commit 533fa440aa
Signed by: pat-s
GPG key ID: 3C6318841EF78925
1 changed files with 75 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
R/package_index.R
View file

@ -15,12 +15,19 @@ add_to_package_index <- function(
r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
}
local_arch <- Sys.info()[["machine"]]
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
arch <- "arm64"
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
arch <- "amd64"
}
if (!build_for_minor) {
local_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib/", local_build_root, codename)
remote_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib/", bucket, codename)
local_bin_dir <- set_bin_path(r_minor_version, build_for_minor, local_build_root, codename)
remote_bin_dir <- sprintf("%s/%s/%s/latest/src/contrib", bucket, arch, codename)
} else {
dir_out_bin <- sprintf("%s/arm64/%s/%s/latest/src/contrib/", local_build_root, codename, r_minor_version)
remote_bin_dir <- sprintf("%s/arm64/%s/%s/latest/src/contrib/", bucket, codename, r_minor_version)
dir_out_bin <- set_bin_path(r_minor_version, build_for_minor, local_build_root, codename)
remote_bin_dir <- sprintf("%s/%s/%s/%s/latest/src/contrib", bucket, arch, codename, r_minor_version)
}
s3fs::s3_file_system(
@ -61,12 +68,19 @@ upload_package_index <- function(
r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
}
local_arch <- Sys.info()[["machine"]]
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
arch <- "arm64"
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
arch <- "amd64"
}
if (!build_for_minor) {
local_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib", local_build_root, codename)
remote_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib", bucket, codename)
local_bin_dir <- set_bin_path(r_minor_version, build_for_minor, local_build_root, codename)
remote_bin_dir <- sprintf("%s/%s/%s/latest/src/contrib", bucket, arch, codename)
} else {
dir_out_bin <- sprintf("%s/arm64/%s/%s/latest/src/contrib", local_build_root, codename, r_minor_version)
remote_bin_dir <- sprintf("%s/arm64/%s/%s/latest/src/contrib", bucket, codename, r_minor_version)
dir_out_bin <- set_bin_path(r_minor_version, build_for_minor, local_build_root, codename)
remote_bin_dir <- sprintf("%s/%s/%s/%s/latest/src/contrib", bucket, arch, codename, r_minor_version)
}
s3fs::s3_file_system(