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

variable renaming

Browse source
This commit is contained in:
Patrick Schratz 2024-07-24 22:09:19 +02:00
commit 3fbc5ae88e
Signed by: pat-s
GPG key ID: 3C6318841EF78925
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NAMESPACE
View file

@ -15,7 +15,7 @@ importFrom(DBI,dbGetQuery)
importFrom(DBI,dbListTables) importFrom(DBI,dbListTables)
importFrom(DBI,dbWriteTable) importFrom(DBI,dbWriteTable)
importFrom(RPostgres,Postgres) importFrom(RPostgres,Postgres)
importFrom(cli,cli_alert_info) importFrom(cli,cli_alert)
importFrom(cranlike,add_PACKAGES) importFrom(cranlike,add_PACKAGES)
importFrom(dplyr,all_vars) importFrom(dplyr,all_vars)
importFrom(dplyr,filter) importFrom(dplyr,filter)

4
R/helpers.R
View file

@ -29,7 +29,7 @@ set_codename <- function(codename) {
#' Helper function to set the path for binary package outputs #' Helper function to set the path for binary package outputs
#' @export #' @export
set_bin_path <- function( set_bin_path <- function(
r_version_minor, build_for_minor, r_minor_version, build_for_minor,
local_build_root, codename) { local_build_root, codename) {
if (!build_for_minor) { if (!build_for_minor) {
path <- sprintf( path <- sprintf(
@ -39,7 +39,7 @@ set_bin_path <- function(
} else { } else {
path <- sprintf( path <- sprintf(
"%s/__linux__/%s/%s/latest/src/contrib", "%s/__linux__/%s/%s/latest/src/contrib",
local_build_root, codename, r_version_minor local_build_root, codename, r_minor_version
) )
} }
return(path) return(path)

10
R/upload.R
View file

@ -6,17 +6,17 @@ upload_single_binary_to_s3 <- function(
bucket = "devxy-arm64-r-binaries", bucket = "devxy-arm64-r-binaries",
local_build_root = "/root", codename = NULL, local_build_root = "/root", codename = NULL,
package_name, tag, package_name, tag,
r_version_minor = NULL, build_for_minor = FALSE, r_minor_version = NULL, build_for_minor = FALSE,
force = FALSE, force = FALSE,
debug = FALSE) { debug = FALSE) {
codename <- set_codename(codename) codename <- set_codename(codename)
if (is.null(r_version_minor)) { if (is.null(r_minor_version)) {
r_version_minor <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string) r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
} }
local_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = local_build_root, codename) local_bin_path <- set_bin_path(r_minor_version, build_for_minor, local_build_root = local_build_root, codename)
remote_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = bucket, codename) remote_bin_path <- set_bin_path(r_minor_version, build_for_minor, local_build_root = bucket, codename)
if (debug) { if (debug) {
cli::cli_alert_danger("DEBUG: dir_out_bin: {dir_out_bin}, codename: {codename}") cli::cli_alert_danger("DEBUG: dir_out_bin: {dir_out_bin}, codename: {codename}")

2
man/set_bin_path.Rd
View file

@ -4,7 +4,7 @@
\alias{set_bin_path} \alias{set_bin_path}
\title{Helper function to set the path for binary package outputs} \title{Helper function to set the path for binary package outputs}
\usage{ \usage{
set_bin_path(r_version_minor, build_for_minor, local_build_root, codename) set_bin_path(r_minor_version, build_for_minor, local_build_root, codename)
} }
\description{ \description{
Helper function to set the path for binary package outputs Helper function to set the path for binary package outputs