fix build and clean
This commit is contained in:
parent
949e2bc6d0
commit
3c5a770e02
3 changed files with 7 additions and 21 deletions
|
|
@ -7,5 +7,5 @@
|
||||||
.prettierrc.json
|
.prettierrc.json
|
||||||
.woodpecker
|
.woodpecker
|
||||||
devxy-arm64-r-binaries/
|
devxy-arm64-r-binaries/
|
||||||
PACKAGES*
|
PACKAGES.*
|
||||||
s3:*
|
s3:*
|
||||||
|
|
@ -21,6 +21,7 @@ importFrom(DBI,dbWriteTable)
|
||||||
importFrom(RPostgres,Postgres)
|
importFrom(RPostgres,Postgres)
|
||||||
importFrom(cli,cli_alert)
|
importFrom(cli,cli_alert)
|
||||||
importFrom(cranlike,add_PACKAGES)
|
importFrom(cranlike,add_PACKAGES)
|
||||||
|
importFrom(cranlike,update_PACKAGES)
|
||||||
importFrom(dplyr,filter)
|
importFrom(dplyr,filter)
|
||||||
importFrom(dplyr,group_by)
|
importFrom(dplyr,group_by)
|
||||||
importFrom(dplyr,n)
|
importFrom(dplyr,n)
|
||||||
|
|
|
||||||
94
R/package_index.R
Normal file
94
R/package_index.R
Normal file
|
|
@ -0,0 +1,94 @@
|
||||||
|
#' @importFrom cranlike add_PACKAGES
|
||||||
|
#' @importFrom s3fs s3_dir_ls s3_file_system
|
||||||
|
#' @export
|
||||||
|
add_to_package_index <- function(
|
||||||
|
package_name = NULL,
|
||||||
|
endpoint = "https://s3.eu-central-003.backblazeb2.com",
|
||||||
|
region = "eu-central-003",
|
||||||
|
bucket = "devxy-arm64-r-binaries",
|
||||||
|
local_build_root = "/mnt/cache/binaries",
|
||||||
|
codename = NULL, r_minor_version = NULL,
|
||||||
|
build_for_minor = FALSE,
|
||||||
|
debug = FALSE) {
|
||||||
|
codename <- set_codename(codename)
|
||||||
|
if (is.null(r_minor_version)) {
|
||||||
|
r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
} 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)
|
||||||
|
}
|
||||||
|
|
||||||
|
s3fs::s3_file_system(
|
||||||
|
aws_access_key_id = Sys.getenv("AWS_ACCESS_KEY_ID"),
|
||||||
|
aws_secret_access_key = Sys.getenv("AWS_SECRET_ACCESS_KEY"),
|
||||||
|
endpoint = endpoint,
|
||||||
|
region_name = region,
|
||||||
|
)
|
||||||
|
|
||||||
|
# get latest PACKAGES file from S3
|
||||||
|
if (!s3fs::s3_file_exists(sprintf("%s/PACKAGES", remote_bin_dir))) {
|
||||||
|
s3fs::s3_file_download(sprintf("%s/PACKAGES", remote_bin_dir), sprintf("%s/PACKAGES", local_bin_dir))
|
||||||
|
}
|
||||||
|
file_names <- list.files(local_bin_dir, pattern = sprintf("%s*", package_name))
|
||||||
|
|
||||||
|
# list all tarballs for the given package
|
||||||
|
cranlike::add_PACKAGES(file_names, local_bin_dir)
|
||||||
|
|
||||||
|
return(invisible(TRUE))
|
||||||
|
}
|
||||||
|
|
||||||
|
#' @importFrom s3fs s3_file_upload s3_dir_ls
|
||||||
|
#' @importFrom cranlike update_PACKAGES
|
||||||
|
#' @export
|
||||||
|
upload_package_index <- function(
|
||||||
|
package_name = NULL,
|
||||||
|
endpoint = "https://s3.eu-central-003.backblazeb2.com",
|
||||||
|
region = "eu-central-003",
|
||||||
|
bucket = "devxy-arm64-r-binaries",
|
||||||
|
local_build_root = ".",
|
||||||
|
codename = NULL, r_minor_version = NULL,
|
||||||
|
build_for_minor = FALSE,
|
||||||
|
debug = FALSE) {
|
||||||
|
cli::cli_alert("{.fun upload_package_index}: Uploading PACKAGES* files to S3.")
|
||||||
|
|
||||||
|
codename <- set_codename(codename)
|
||||||
|
if (is.null(r_minor_version)) {
|
||||||
|
r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
} 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)
|
||||||
|
}
|
||||||
|
|
||||||
|
s3fs::s3_file_system(
|
||||||
|
aws_access_key_id = Sys.getenv("AWS_ACCESS_KEY_ID"),
|
||||||
|
aws_secret_access_key = Sys.getenv("AWS_SECRET_ACCESS_KEY"),
|
||||||
|
endpoint = endpoint,
|
||||||
|
region_name = region,
|
||||||
|
)
|
||||||
|
|
||||||
|
pkgs <- s3fs::s3_dir_ls(remote_bin_dir)
|
||||||
|
pkg_count <- length(pkgs) - 4
|
||||||
|
unique_pkgs <- length(unique(sapply(strsplit(basename(pkgs), "_"), function(x) x[1])))
|
||||||
|
t1 <- Sys.time()
|
||||||
|
cranlike::update_PACKAGES(sprintf("s3://%s", remote_bin_dir))
|
||||||
|
total_build_time <- round(Sys.time() - t1, 2)
|
||||||
|
cli::cli_alert("Time updating PACKAGES index for {.field {pkg_count}} ({.field {unique_pkgs}} unique) packages: {.strong {total_build_time} {units(difftime(Sys.time(), t1))}}.")
|
||||||
|
|
||||||
|
purrr::walk2(
|
||||||
|
c("PACKAGES", "PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz"),
|
||||||
|
sprintf("%s/%s", remote_bin_dir, c("PACKAGES", "PACKAGES.db", "PACKAGES.rds", "PACKAGES.gz")),
|
||||||
|
\(x, y) s3fs::s3_file_upload(x, y, overwrite = TRUE)
|
||||||
|
)
|
||||||
|
|
||||||
|
return(invisible(TRUE))
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue