From ed50867535ef5126c04c5fa6b56a4ecfcf8769de Mon Sep 17 00:00:00 2001
From: "Matthijs S. Berends" <berendsms@gmail.com>
Date: Wed, 24 Oct 2018 18:10:53 +0000
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09a9f3ea..5032bdee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,45 @@
 # from https://stackoverflow.com/questions/51866926
 # and https://github.com/jangorecki/r.gitlab.ci
 
-image: rocker/r-base
+# https://hub.docker.com/r/rocker/
+# image: rocker/r-base
 
 stages:
     - build
     - deploy
 
-linux_job:
+R 3.3:
+    image: rocker/r-ver:3.3 # rocker/r-base
+    stage: build
+    script:
+    - apt-get update
+    # install dependencies for package
+    - apt-get install --yes --no-install-recommends r-cran-xml2 r-cran-testthat r-cran-devtools
+    - R -e 'devtools::install_deps(dependencies = c("Depends", "Imports", "Suggests"))'
+    # remove vignettes folder and get VignetteBuilder field out of DESCRIPTION file
+    - rm -rf vignettes
+    - R -e 'd <- read.dcf("DESCRIPTION"); d[, colnames(d) == "VignetteBuilder"] <- NA; write.dcf(d, "DESCRIPTION")'
+    - R CMD build . --no-build-vignettes --no-manual
+    - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1)
+    - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual --as-cran
+    
+R 3.4:
+    image: rocker/r-ver:3.4 # rocker/r-base
+    stage: build
+    script:
+    - apt-get update
+    # install dependencies for package
+    - apt-get install --yes --no-install-recommends r-cran-xml2 r-cran-testthat r-cran-devtools
+    - R -e 'devtools::install_deps(dependencies = c("Depends", "Imports", "Suggests"))'
+    # remove vignettes folder and get VignetteBuilder field out of DESCRIPTION file
+    - rm -rf vignettes
+    - R -e 'd <- read.dcf("DESCRIPTION"); d[, colnames(d) == "VignetteBuilder"] <- NA; write.dcf(d, "DESCRIPTION")'
+    - R CMD build . --no-build-vignettes --no-manual
+    - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1)
+    - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual --as-cran
+    
+R 3.5:
+    image: rocker/r-ver:3.5 # rocker/r-base
     stage: build
     script:
     - apt-get update
@@ -21,20 +53,6 @@ linux_job:
     - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1)
     - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual --as-cran
 
-osx_job:
-    stage: build
-    tags:
-    - osx
-    script:
-    - R -e 'devtools::install_deps(dependencies = c("Depends", "Imports", "Suggests"))'
-    # remove vignettes folder and get VignetteBuilder field out of DESCRIPTION file
-    - rm -rf vignettes
-    - R -e 'd <- read.dcf("DESCRIPTION"); d[, colnames(d) == "VignetteBuilder"] <- NA; write.dcf(d, "DESCRIPTION")'
-    - R CMD build . --no-build-vignettes --no-manual
-    - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1)
-    - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual --as-cran
-
-
 coverage_job:
     stage: deploy
     script: