Skip to content

Commit

Permalink
GH-39859: [R] Remove macOS from the allow list (#39861)
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Jonathan Keane <[email protected]>
  • Loading branch information
jonkeane authored Feb 1, 2024
1 parent 4ceb661 commit b684028
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion r/tools/nixlibs-allowlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ ubuntu
centos
redhat
rhel
darwin
2 changes: 1 addition & 1 deletion r/tools/nixlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit b684028

Please sign in to comment.