Fix R pkg test

dmlc · Nov 27, 2024 · 91b2ecf · 91b2ecf
1 parent 23a21ef
commit 91b2ecf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/r_tests.yml b/.github/workflows/r_tests.yml
@@ -1,4 +1,4 @@
-name: XGBoost-R-Tests
+name: XGBoost (R package)
 
 on: [push, pull_request]
 

diff --git a/ops/docker/ci_container.yml b/ops/docker/ci_container.yml
@@ -25,7 +25,7 @@ xgb-ci.gpu_build_r_rockylinux8:
   container_def: gpu_build_r_rockylinux8
   build_args:
     CUDA_VERSION_ARG: "12.4.1"
-    R_VERSION_ARG: "4.3.2"
+    R_VERSION_ARG: "4.4.2"
 
 xgb-ci.alpine:
   container_def: alpine

diff --git a/ops/docker/dockerfile/Dockerfile.gpu_build_r_rockylinux8 b/ops/docker/dockerfile/Dockerfile.gpu_build_r_rockylinux8
@@ -11,13 +11,13 @@ RUN \
     dnf -y install dnf-plugins-core && \
     dnf config-manager --set-enabled powertools && \
     dnf install -y tar unzip wget xz git which ninja-build readline-devel libX11-devel libXt-devel \
-                   xorg-x11-server-devel openssl-devel zlib-devel bzip2-devel xz-devel \
-                   pcre2-devel libcurl-devel texlive-* \
+                   xorg-x11-server-devel openssl-devel zlib-devel bzip2-devel xz-devel libxml2-devel \
+                   pcre2-devel libcurl-devel texlive-* pandoc \
                    gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ \
                    gcc-toolset-10-gcc-gfortran gcc-toolset-10-libquadmath-devel \
                    gcc-toolset-10-runtime gcc-toolset-10-libstdc++-devel
 
-ENV PATH=/opt/miniforge/bin:/usr/local/ninja:/opt/software/packages/bin:/opt/R/$R_VERSION_ARG/bin:$PATH
+ENV PATH=/usr/local/ninja:/opt/software/packages/bin:/opt/R/$R_VERSION_ARG/bin:$PATH
 ENV LD_LIBRARY_PATH=/opt/software/packages/lib:/opt/R/$R_VERSION_ARG/lib64:$LD_LIBRARY_PATH
 ENV CC=/opt/rh/gcc-toolset-10/root/usr/bin/gcc
 ENV CXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++
@@ -31,13 +31,7 @@ RUN \
     cd R-$R_VERSION_ARG  && \
     ./configure --prefix=/opt/R/$R_VERSION_ARG --enable-R-shlib --with-pcrel  && \
     make -j$(nproc)  && \
-    make install
-
-run \
-    # Python
-    wget -nv -O conda.sh https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-x86_64.sh && \
-    bash conda.sh -b -p /opt/miniforge && \
-    /opt/miniforge/bin/python -m pip install auditwheel awscli && \
+    make install && \
     # CMake
     wget -nv -nc https://cmake.org/files/v3.29/cmake-3.29.5-linux-x86_64.sh --no-check-certificate && \
     bash cmake-3.29.5-linux-x86_64.sh --skip-license --prefix=/usr

diff --git a/ops/pipeline/test-rpkg-impl.sh b/ops/pipeline/test-rpkg-impl.sh
@@ -13,5 +13,6 @@ build_tool="$1"
 
 set -x
 
-gosu root Rscript ./R-package/tests/helper_scripts/install_deps.R
+R -e 'dir.create(Sys.getenv("R_LIBS_USER"), recursive = TRUE)'
+Rscript ./R-package/tests/helper_scripts/install_deps.R
 python3 ops/script/test_r_package.py --build-tool="${build_tool}"