Skip to content

Commit 198d379

Browse files
committed
try a different envvar
1 parent f4a35d8 commit 198d379

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

ci/scripts/r_test.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ if [ "$ARROW_R_DEV" = "TRUE" ]; then
6060
fi
6161
fi
6262

63-
export _R_CHECK_CRAN_INCOMING_REMOTE_=FALSE
63+
export _R_CHECK_CRAN_INCOMING_REMOTE_=TRUE
64+
export _R_CHECK_CRAN_INCOMING_=TRUE
6465
# --run-donttest was used in R < 4.0, this is used now
6566
export _R_CHECK_DONTTEST_EXAMPLES_=TRUE
6667
# Not all Suggested packages are needed for checking, so in case they aren't installed don't fail
@@ -90,6 +91,8 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
9091
if (as_cran) {
9192
args <- '--as-cran'
9293
build_args <- character()
94+
# Attempt to install pandoc, this will only work on systems with apt
95+
system(c('apt install -y pandoc'))
9396
} else {
9497
args <- c('--no-manual', '--ignore-vignettes')
9598
build_args <- '--no-build-vignettes'
@@ -110,6 +113,11 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
110113
on.exit(tools::pskill(pid_flight), add = TRUE)
111114
}
112115
116+
run_donttest <- identical(tolower(Sys.getenv('_R_CHECK_DONTTEST_EXAMPLES_', 'true')), 'true')
117+
if (run_donttest) {
118+
args <- c(args, '--run-donttest')
119+
}
120+
113121
install_args <- Sys.getenv('INSTALL_ARGS')
114122
if (nzchar(install_args)) {
115123
args <- c(args, paste0('--install-args=\"', install_args, '\"'))
@@ -119,7 +127,7 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
119127
print(build_args)
120128
print(args)
121129
122-
rcmdcheck::rcmdcheck(build_args = build_args, args = args, error_on = 'warning', check_dir = 'check', timeout = 3600)"
130+
rcmdcheck::rcmdcheck(build_args = build_args, args = args, error_on = 'warning', check_dir = 'check', timeout = 3600, env = env)"
123131
echo "$SCRIPT" | ${R_BIN} --no-save
124132

125133
AFTER=$(ls -alh ~/)

0 commit comments

Comments
 (0)