This is an automated email from the ASF dual-hosted git repository.

assignuser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 3cc04f1e83 GH-39523: [R] Don't override explicitly set NOT_CRAN=false 
when on dev version (#39524)
3cc04f1e83 is described below

commit 3cc04f1e8389deea18b88eedc5b4e3458467d9c6
Author: Jacob Wujciak-Jens <[email protected]>
AuthorDate: Fri Jan 12 05:08:40 2024 +0100

    GH-39523: [R] Don't override explicitly set NOT_CRAN=false when on dev 
version (#39524)
    
    ### Rationale for this change
    
    The default linux build used in the lto job should not build with aws/gcs. 
A change in the build system changed this.
    
    ### What changes are included in this PR?
    
    Revert to old behavior by not overriding explicitly set `NOT_CRAN=false`.
    
    ### Are these changes tested?
    
    CI
    
    ### Are there any user-facing changes?
    
    No
    * Closes: #39523
    
    Lead-authored-by: Jacob Wujciak-Jens <[email protected]>
    Co-authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Jacob Wujciak-Jens <[email protected]>
---
 r/tools/nixlibs.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R
index fe8de284b1..9027aa227a 100644
--- a/r/tools/nixlibs.R
+++ b/r/tools/nixlibs.R
@@ -860,7 +860,8 @@ if (is_release) {
   VERSION <- VERSION[1, 1:3]
   arrow_repo <- paste0(getOption("arrow.repo", 
sprintf("https://apache.jfrog.io/artifactory/arrow/r/%s";, VERSION)), 
"/libarrow/")
 } else {
-  not_cran <- TRUE
+  # Don't override explictily set NOT_CRAN env var, as it is used in CI.
+  not_cran <- !env_is("NOT_CRAN", "false")
   arrow_repo <- paste0(getOption("arrow.dev_repo", 
"https://nightlies.apache.org/arrow/r";), "/libarrow/")
 }
 

Reply via email to