diff --git a/.Rbuildignore b/.Rbuildignore index 10e84cc3f88d86eb9e4470dfe22039e513e9a48a..d45273bbad39da7a7fa3cbb3a80a1b250da08a1b 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,9 +1,8 @@ -^renv$ -^renv\.lock$ ^.gitlab-ci.yml ^.*\.Rproj$ ^\.Rproj\.user$ ^\.Rprofile$ +^cache$ ^ci$ ^config.yml ^data-raw$ @@ -16,4 +15,6 @@ ^Meta$ ^packrat/ ^public$ +^renv$ +^renv\.lock$ ^tmp$ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba5aa05cebdafe81a433bf08aa79e6a26a4959ab..36b94fd259e9e27513ac1f6da19ce4628603ebca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,17 +13,15 @@ test: variables: RETICULATE_MINICONDA_PATH: "/root/.local/share/r-miniconda/" RETICULATE_PYTHON_ENV: "/root/.local/share/r-miniconda/envs/r-reticulate/" - RENV_CONFIG_EXTERNAL_LIBRARIES: "/usr/local/lib/R/site-library:/usr/local/lib/R/library" + RENV_CONFIG_EXTERNAL_LIBRARIES: "/usr/local/lib/R/library" RENV_PATHS_CACHE: "$CI_PROJECT_DIR/cache" RENV_PATHS_LIBRARY: "$CI_PROJECT_DIR/renv/library" before_script: - # Install deps or load from renv - R -e "if (!requireNamespace('renv', quietly = TRUE)) install.packages('renv')" - #- R -e 'renv::restore()' + #- R -e 'renv::restore()' does fail while loading Bioconductor packages - R -e 'renv::install()' - R -e 'renv::install("bioc::rhdf5")' script: - # Build and Check r2ogs6 - R CMD build . --no-build-vignettes --no-manual - R CMD check $(ls -1t *.tar.gz | head -n 1) --no-build-vignettes --no-manual after_script: