From 8fedaf19c9edbf48fd2dbfe2d2a7138a097bc09e Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Thu, 1 Feb 2024 08:16:56 -0600 Subject: [PATCH] GH-39859: [R] Remove macOS from the allow list (#39861) Originally this was going to also bundle all of our dependencies to send to CRAN, but their webforms don't allow source tars that large (I tried down to 80MB which removed a large number of our dependencies, and that was still rejected by the macbuilder). This means that on CRAN, if there is no internet, the macOS binary will be minimal. But it means that we build on CRAN using source always. We should definitely submit this to macbuilder after this merges to main and confirm we get source build by default (since we look to the repo for our allowlist) * Closes: #39859 Authored-by: Jonathan Keane Signed-off-by: Jonathan Keane --- r/tools/nixlibs-allowlist.txt | 1 - r/tools/nixlibs.R | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/r/tools/nixlibs-allowlist.txt b/r/tools/nixlibs-allowlist.txt index 9c368e6ed15a2..bd9f0c1b2c084 100644 --- a/r/tools/nixlibs-allowlist.txt +++ b/r/tools/nixlibs-allowlist.txt @@ -2,4 +2,3 @@ ubuntu centos redhat rhel -darwin diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R index 17c6ab0a8078b..0af41888b95b7 100644 --- a/r/tools/nixlibs.R +++ b/r/tools/nixlibs.R @@ -222,7 +222,7 @@ check_allowlist <- function(os, allowed = "https://raw.githubusercontent.com/apa # Try a remote allowlist so that we can add/remove without a release suppressWarnings(readLines(allowed)), # Fallback to default: allowed only on Ubuntu and CentOS/RHEL - error = function(e) c("ubuntu", "centos", "redhat", "rhel", "darwin") + error = function(e) c("ubuntu", "centos", "redhat", "rhel") ) # allowlist should contain valid regular expressions (plain strings ok too) any(grepl(paste(allowlist, collapse = "|"), os))