From 0705f91991a880b823f018d41527f306ea6c6788 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@irstea.fr>
Date: Tue, 8 Nov 2022 09:45:02 +0100
Subject: [PATCH] ci: use rocker/geospatial and reorganise package installation
---
.gitlab-ci.yml | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b307c48..8c42b4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,12 @@
stages:
- - checks
- - website
+ - install
+ - checks
+ - website
default:
tags: [docker]
-image: rocker/verse:latest
-
-cache:
- paths:
- - "$CI_PROJECT_DIR/ci/lib/"
+image: rocker/geospatial:latest
variables:
R_LIBS_USER: "$CI_PROJECT_DIR/ci/lib"
@@ -23,8 +20,12 @@ cache:
before_script:
- mkdir -p $R_LIBS_USER $BUILD_LOGS_DIR
- echo "R_LIBS='$R_LIBS_USER'" > .Renviron
- - sudo apt-get update && sudo apt-get install -y libudunits2-dev
- - R -q -e 'devtools::install_deps(dep = T)'
+
+install:
+ stage: install
+ script:
+ - R -q -e 'devtools::install_deps(dependencies = TRUE, repos = "http://cran.r-project.org", build = TRUE)'
+ - R -q -e 'devtools::install(quick = TRUE)'
.check:
stage: checks
@@ -60,9 +61,6 @@ bookdown:
- dev
- tags
script:
- - sudo apt-get update && sudo apt-get install -y proj-bin libgdal-dev libgeos-dev
- - R -q -e 'devtools::install_deps(dependencies = TRUE, repos = "http://cran.r-project.org", build = TRUE)'
- - R -q -e 'devtools::install(quick = TRUE)'
- cd bookdown
- R -q -e 'bookdown::render_book()'
- sudo apt-get update && sudo apt-get install -y sshpass rsync
--
GitLab