Skip to content

Commit

Permalink
apacheGH-39523: [R] Don't override explicitly set NOT_CRAN=false when…
Browse files Browse the repository at this point in the history
… on dev version (apache#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: apache#39523

Lead-authored-by: Jacob Wujciak-Jens <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Jacob Wujciak-Jens <[email protected]>
  • Loading branch information
assignUser and kou authored Jan 12, 2024
1 parent c78a1ae commit 3cc04f1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion r/tools/nixlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -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/")
}

Expand Down

0 comments on commit 3cc04f1

Please sign in to comment.