From aff6debca6a9134b43596f2361a77a43c1e96785 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 28 Jul 2024 10:55:28 +0200 Subject: [PATCH] change remote dir structure --- R/helpers.R | 4 ++-- R/packages_index.R | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/R/helpers.R b/R/helpers.R index 6e491be..bd7ac87 100644 --- a/R/helpers.R +++ b/R/helpers.R @@ -33,12 +33,12 @@ set_bin_path <- function( local_build_root, codename) { if (!build_for_minor) { path <- sprintf( - "%s/__linux__/%s/latest/src/contrib", + "%s/arm64/%s/latest/src/contrib", local_build_root, codename ) } else { path <- sprintf( - "%s/__linux__/%s/%s/latest/src/contrib", + "%s/arm64/%s/%s/latest/src/contrib", local_build_root, codename, r_minor_version ) } diff --git a/R/packages_index.R b/R/packages_index.R index 9d3b464..57792a7 100644 --- a/R/packages_index.R +++ b/R/packages_index.R @@ -16,11 +16,11 @@ add_to_package_index <- function( } if (!build_for_minor) { - local_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib/", local_build_root, codename) - remote_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib/", bucket, codename) + 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) } else { - dir_out_bin <- sprintf("%s/__linux__/%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) + 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) } s3fs::s3_file_system( @@ -66,11 +66,11 @@ upload_package_index <- function( } if (!build_for_minor) { - local_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib", local_build_root, codename) - remote_bin_dir <- sprintf("%s/__linux__/%s/latest/src/contrib", bucket, codename) + 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) } else { - dir_out_bin <- sprintf("%s/__linux__/%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) + 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) } s3fs::s3_file_system( @@ -103,7 +103,7 @@ upload_package_index <- function( # } # 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)) }