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

change remote dir structure

Browse source
This commit is contained in:
Patrick Schratz 2024-07-28 10:55:28 +02:00
commit aff6debca6
Signed by: pat-s
GPG key ID: 3C6318841EF78925
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
R/helpers.R
View file

@ -33,12 +33,12 @@ set_bin_path <- function(
local_build_root, codename) { local_build_root, codename) {
if (!build_for_minor) { if (!build_for_minor) {
path <- sprintf( path <- sprintf(
"%s/__linux__/%s/latest/src/contrib", "%s/arm64/%s/latest/src/contrib",
local_build_root, codename local_build_root, codename
) )
} else { } else {
path <- sprintf( path <- sprintf(
"%s/__linux__/%s/%s/latest/src/contrib", "%s/arm64/%s/%s/latest/src/contrib",
local_build_root, codename, r_minor_version local_build_root, codename, r_minor_version
) )
} }

18
R/packages_index.R
View file

@ -16,11 +16,11 @@ add_to_package_index <- function(
} }
if (!build_for_minor) { if (!build_for_minor) {
local_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib/", local_build_root, codename) local_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib/", local_build_root, codename)
remote_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib/", bucket, codename) remote_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib/", bucket, codename)
} else { } else {
dir_out_bin <- sprintf("%s/__linux__/%s/%s/latest/src/contrib/", local_build_root, codename, r_minor_version) dir_out_bin <- sprintf("%s/arm64/%s/%s/latest/src/contrib/", local_build_root, codename, r_minor_version)
remote_bin_dir <- sprintf("%s/__linux__/%s/%s/latest/src/contrib/", bucket, codename, r_minor_version) remote_bin_dir <- sprintf("%s/arm64/%s/%s/latest/src/contrib/", bucket, codename, r_minor_version)
} }
s3fs::s3_file_system( s3fs::s3_file_system(
@ -66,11 +66,11 @@ upload_package_index <- function(
} }
if (!build_for_minor) { if (!build_for_minor) {
local_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib", local_build_root, codename) local_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib", local_build_root, codename)
remote_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib", bucket, codename) remote_bin_dir <- sprintf("%s/arm64/%s/latest/src/contrib", bucket, codename)
} else { } else {
dir_out_bin <- sprintf("%s/__linux__/%s/%s/latest/src/contrib", local_build_root, codename, r_minor_version) dir_out_bin <- sprintf("%s/arm64/%s/%s/latest/src/contrib", local_build_root, codename, r_minor_version)
remote_bin_dir <- sprintf("%s/__linux__/%s/%s/latest/src/contrib", bucket, codename, r_minor_version) remote_bin_dir <- sprintf("%s/arm64/%s/%s/latest/src/contrib", bucket, codename, r_minor_version)
} }
s3fs::s3_file_system( s3fs::s3_file_system(
@ -103,7 +103,7 @@ upload_package_index <- function(
# } # }
# s3 <- paws.storage::s3(endpoint = endpoint, region = region) # s3 <- paws.storage::s3(endpoint = endpoint, region = region)
# s3$put_object(Body = pkgs_upload_local, Bucket = bucket, Key = "__linux__/rhel9/latest/src/contrib/PACKAGES") # s3$put_object(Body = pkgs_upload_local, Bucket = bucket, Key = "arm64/rhel9/latest/src/contrib/PACKAGES")
return(invisible(TRUE)) return(invisible(TRUE))
} }