This is an automated email from the ASF dual-hosted git repository.
jonkeane 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 8f3bf67cca GH-41841: [R][CI] Remove more defunct rhub containers
(#41828)
8f3bf67cca is described below
commit 8f3bf67cca32902e241b1857502247918861a3f8
Author: Jonathan Keane <[email protected]>
AuthorDate: Tue May 28 17:26:09 2024 -0500
GH-41841: [R][CI] Remove more defunct rhub containers (#41828)
Testing CI to see if we can replicate the incoming NOTEs:
```
Found the following (possibly) invalid file URIs:
URI: articles/read_write.html
From: README.md
URI: articles/data_wrangling.html
From: README.md
URI: reference/acero.html
From: README.md
URI: articles/install.html
From: README.md
URI: articles/install_nightly.html
From: README.md
```
I wasn't able to replicate them in CI (even with
`_R_CHECK_CRAN_INCOMING_REMOTE_` set to true, and installing pandoc so that the
docs could be munged.)
But in the process realized we were running old rhub images that aren't
updated anymore (thanks, @ thisisnic). Also did a bit of cleanup of
`--run-donttest` which is now no longer needed (was removed in favor of the env
var in 4.0)
* GitHub Issue: #41841
Authored-by: Jonathan Keane <[email protected]>
Signed-off-by: Jonathan Keane <[email protected]>
---
.github/workflows/r.yml | 5 ++--
ci/scripts/r_install_system_dependencies.sh | 43 +++++++++++++++--------------
ci/scripts/r_test.sh | 9 +++---
dev/tasks/r/github.linux.cran.yml | 9 +++---
r/Makefile | 4 +--
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index aba7734765..6bd940f806 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -370,11 +370,12 @@ jobs:
MAKEFLAGS = paste0("-j", parallel::detectCores()),
ARROW_R_DEV = TRUE,
"_R_CHECK_FORCE_SUGGESTS_" = FALSE,
- "_R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_" = TRUE
+ "_R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_" = TRUE,
+ "_R_CHECK_DONTTEST_EXAMPLES_" = TRUE
)
rcmdcheck::rcmdcheck(".",
build_args = '--no-build-vignettes',
- args = c('--no-manual', '--as-cran', '--ignore-vignettes',
'--run-donttest'),
+ args = c('--no-manual', '--as-cran', '--ignore-vignettes'),
error_on = 'warning',
check_dir = 'check',
timeout = 3600
diff --git a/ci/scripts/r_install_system_dependencies.sh
b/ci/scripts/r_install_system_dependencies.sh
index be0d75ef23..7ddc2604f6 100755
--- a/ci/scripts/r_install_system_dependencies.sh
+++ b/ci/scripts/r_install_system_dependencies.sh
@@ -21,29 +21,30 @@ set -ex
: ${ARROW_SOURCE_HOME:=/arrow}
-if [ "$ARROW_S3" == "ON" ] || [ "$ARROW_GCS" == "ON" ] || [ "$ARROW_R_DEV" ==
"TRUE" ]; then
- # Figure out what package manager we have
- if [ "`which dnf`" ]; then
- PACKAGE_MANAGER=dnf
- elif [ "`which yum`" ]; then
- PACKAGE_MANAGER=yum
- elif [ "`which zypper`" ]; then
- PACKAGE_MANAGER=zypper
- else
- PACKAGE_MANAGER=apt-get
- apt-get update
- fi
+# Figure out what package manager we have
+if [ "`which dnf`" ]; then
+ PACKAGE_MANAGER=dnf
+elif [ "`which yum`" ]; then
+ PACKAGE_MANAGER=yum
+elif [ "`which zypper`" ]; then
+ PACKAGE_MANAGER=zypper
+else
+ PACKAGE_MANAGER=apt-get
+ apt-get update
+fi
- # Install curl and OpenSSL for S3/GCS support
- case "$PACKAGE_MANAGER" in
- apt-get)
- apt-get install -y libcurl4-openssl-dev libssl-dev
- ;;
- *)
- $PACKAGE_MANAGER install -y libcurl-devel openssl-devel
- ;;
- esac
+# Install curl and OpenSSL (technically, only needed for S3/GCS support, but
+# installing the R curl package fails without it)
+case "$PACKAGE_MANAGER" in
+ apt-get)
+ apt-get install -y libcurl4-openssl-dev libssl-dev
+ ;;
+ *)
+ $PACKAGE_MANAGER install -y libcurl-devel openssl-devel
+ ;;
+esac
+if [ "$ARROW_S3" == "ON" ] || [ "$ARROW_GCS" == "ON" ] || [ "$ARROW_R_DEV" ==
"TRUE" ]; then
# The Dockerfile should have put this file here
if [ "$ARROW_S3" == "ON" ] && [ -f
"${ARROW_SOURCE_HOME}/ci/scripts/install_minio.sh" ] && [ "`which wget`" ]; then
"${ARROW_SOURCE_HOME}/ci/scripts/install_minio.sh" latest /usr/local
diff --git a/ci/scripts/r_test.sh b/ci/scripts/r_test.sh
index e13da45e2d..fe9d18edb8 100755
--- a/ci/scripts/r_test.sh
+++ b/ci/scripts/r_test.sh
@@ -110,16 +110,15 @@ SCRIPT="as_cran <-
!identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
on.exit(tools::pskill(pid_flight), add = TRUE)
}
- run_donttest <- identical(tolower(Sys.getenv('_R_CHECK_DONTTEST_EXAMPLES_',
'true')), 'true')
- if (run_donttest) {
- args <- c(args, '--run-donttest')
- }
-
install_args <- Sys.getenv('INSTALL_ARGS')
if (nzchar(install_args)) {
args <- c(args, paste0('--install-args=\"', install_args, '\"'))
}
+ message('Running rcmdcheck with:\n')
+ print(build_args)
+ print(args)
+
rcmdcheck::rcmdcheck(build_args = build_args, args = args, error_on =
'warning', check_dir = 'check', timeout = 3600)"
echo "$SCRIPT" | ${R_BIN} --no-save
diff --git a/dev/tasks/r/github.linux.cran.yml
b/dev/tasks/r/github.linux.cran.yml
index 0aeb7cfa2b..34cb4b9446 100644
--- a/dev/tasks/r/github.linux.cran.yml
+++ b/dev/tasks/r/github.linux.cran.yml
@@ -28,11 +28,10 @@ jobs:
matrix:
# See https://hub.docker.com/r/rhub
r_image:
- - debian-gcc-devel
- - debian-gcc-patched
- - debian-gcc-release
- - fedora-gcc-devel
- - fedora-clang-devel
+ - ubuntu-gcc12 # ~ r-devel-linux-x86_64-debian-gcc
+ - ubuntu-clang # ~ r-devel-linux-x86_64-debian-clang
+ - ubuntu-next # ~ r-patched-linux-x86_64
+ - ubuntu-release # ~ r-release-linux-x86_64
env:
R_ORG: "rhub"
R_IMAGE: {{ MATRIX }}
diff --git a/r/Makefile b/r/Makefile
index c3267e8cfe..785e9e1214 100644
--- a/r/Makefile
+++ b/r/Makefile
@@ -52,11 +52,11 @@ build: doc sync-cpp
R CMD build ${args} .
check: build
- -export _R_CHECK_CRAN_INCOMING_REMOTE_=FALSE && export
ARROW_R_DEV=$(ARROW_R_DEV) && export _R_CHECK_TESTS_NLINES_=0 && R CMD check
--as-cran --run-donttest arrow_$(VERSION).tar.gz
+ -export _R_CHECK_CRAN_INCOMING_REMOTE_=FALSE && export
ARROW_R_DEV=$(ARROW_R_DEV) && export _R_CHECK_TESTS_NLINES_=0 && R CMD check
--as-cran arrow_$(VERSION).tar.gz
rm -rf arrow.Rcheck/
release: build
- -export _R_CHECK_TESTS_NLINES_=0 && R CMD check --as-cran
--run-donttest arrow_$(VERSION).tar.gz
+ -export _R_CHECK_TESTS_NLINES_=0 && R CMD check --as-cran
arrow_$(VERSION).tar.gz
rm -rf arrow.Rcheck/
clean:
