From dbfa528e673c14c21b422d72d3601d09bcdb9c7b Mon Sep 17 00:00:00 2001 From: Jiaming Yuan Date: Thu, 16 Jan 2025 15:48:22 +0800 Subject: [PATCH] use r image. [skip ci] --- doc/R-package/.gitignore | 1 + doc/R-package/Makefile | 2 ++ ops/pipeline/build-r-docs-impl.sh | 17 +++++++++-------- ops/pipeline/build-r-docs.sh | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) mode change 100644 => 100755 ops/pipeline/build-r-docs-impl.sh mode change 100644 => 100755 ops/pipeline/build-r-docs.sh diff --git a/doc/R-package/.gitignore b/doc/R-package/.gitignore index b25c15b81fae..8a51ab19c717 100644 --- a/doc/R-package/.gitignore +++ b/doc/R-package/.gitignore @@ -1 +1,2 @@ *~ +*.md diff --git a/doc/R-package/Makefile b/doc/R-package/Makefile index c9a3a494404e..5eff72863f43 100644 --- a/doc/R-package/Makefile +++ b/doc/R-package/Makefile @@ -5,6 +5,8 @@ PKGROOT=../../R-package xgboostfromJSON.md: $(PKGROOT)/vignettes/xgboostfromJSON.Rmd xgboost_introduction.md: $(PKGROOT)/vignettes/xgboost_introduction.Rmd +all: xgboostfromJSON.md xgboost_introduction.md + # General Rules for build rmarkdowns, need knitr %.md: Rscript -e \ diff --git a/ops/pipeline/build-r-docs-impl.sh b/ops/pipeline/build-r-docs-impl.sh old mode 100644 new mode 100755 index d9f5eb6bf0bc..bcedd5c00031 --- a/ops/pipeline/build-r-docs-impl.sh +++ b/ops/pipeline/build-r-docs-impl.sh @@ -10,15 +10,16 @@ set -euo pipefail branch_name=$1 -# See instructions at: https://cran.r-project.org/bin/linux/ubuntu/ +echo "R_LIBS_USER: ${R_LIBS_USER}" -wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc -# add the R 4.0 repo from CRAN -- adjust 'focal' to 'groovy' or 'bionic' as needed -sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" +gosu root chown -R $UID:$GROUPS ${R_LIBS_USER} -sudo apt install --no-install-recommends r-base -Rscript -e "install.packages(c('pkgdown'), repos = 'https://mirror.las.iastate.edu/CRAN/')" cd R-package -Rscript -e "pkgdown::build_site()" +MAKEFLAGS=-j$(nproc) Rscript ./tests/helper_scripts/install_deps.R +MAKEFLAGS=-j$(nproc) Rscript -e "pkgdown::build_site()" cd - -tar cvjf r-docs-${branch_name}.tar.bz2 R-package/docs + +cd doc/R-package +make -j$(nproc) all + +tar cvjf r-docs-${branch_name}.tar.bz2 R-package/docs doc/R-package/xgboost_introduction.md doc/R-package/xgboostfromJSON.md diff --git a/ops/pipeline/build-r-docs.sh b/ops/pipeline/build-r-docs.sh old mode 100644 new mode 100755 index 61ae16e92ecc..09147415ecfe --- a/ops/pipeline/build-r-docs.sh +++ b/ops/pipeline/build-r-docs.sh @@ -10,7 +10,7 @@ fi source ops/pipeline/get-docker-registry-details.sh -IMAGE_URI=${DOCKER_REGISTRY_URL}/xgb-ci.cpu +IMAGE_URI=${DOCKER_REGISTRY_URL}/xgb-ci.gpu_build_r_rockylinux8 echo "--- Build R package doc" set -x