Merge pull request #1056 from RcppCore/feature/expand_ci

Expand CI to four run matrix

Author: eddelbuettel

.travis.yml

@@ -7,25 +7,36 @@ dist: trusty
 sudo: required
 services: docker
 
+jobs:
+  include:
+    - name: release
+      env: DOCKER_CNTR="rcpp/ci" R="R" COVR="yes"
+    - name: r-3.4
+      env: DOCKER_CNTR="rcpp/ci-3.4" R="R"
+    - name: r-3.5
+      env: DOCKER_CNTR="rcpp/ci-3.5" R="R"
+    - name: dev
+      env: DOCKER_CNTR="rcpp/ci-dev" R="RD"
+
 env:
   global:
     - DOCKER_OPTS="--rm -ti -v $(pwd):/mnt -w /mnt"
-      DOCKER_CNTR="rcpp/ci"
       R_BLD_OPTS="--no-build-vignettes --no-manual"
       R_CHK_OPTS="--no-vignettes --no-manual"
 
 before_install:
   - docker pull ${DOCKER_CNTR}
   - docker run ${DOCKER_OPTS} ${DOCKER_CNTR} r -p -e 'sessionInfo()'
+  - if [[ "$R" == "RD" ]]; then docker run ${DOCKER_OPTS} ${DOCKER_CNTR} RDscript -e 'sessionInfo()'; fi
 
 install:
-  - docker run ${DOCKER_OPTS} ${DOCKER_CNTR} R CMD build ${R_BLD_OPTS} .
+  - docker run ${DOCKER_OPTS} ${DOCKER_CNTR} ${R} CMD build ${R_BLD_OPTS} .
 
 script:
-  - docker run ${DOCKER_OPTS} ${DOCKER_CNTR} R CMD check ${R_CHK_OPTS} Rcpp_*.tar.gz
+  - docker run ${DOCKER_OPTS} ${DOCKER_CNTR} ${R} CMD check ${R_CHK_OPTS} Rcpp_*.tar.gz
 
 after_success:
-  - docker run ${DOCKER_OPTS} -e CODECOV_TOKEN ${DOCKER_CNTR} r -l covr -e 'codecov()'
+  - if [[ "$COVR" == "yes" ]]; then docker run ${DOCKER_OPTS} -e CODECOV_TOKEN ${DOCKER_CNTR} r -l covr -e 'codecov()'; fi
 
 notifications:
   email:

ChangeLog

@@ -3,6 +3,12 @@
 	* DESCRIPTION (Version, Date): Roll minor version
         * inst/include/Rcpp/config.h: Idem
 
+	* docker/ci-3.4/Dockerfile: Added
+	* docker/ci-3.5/Dockerfile: Idem
+	* docker/ci-dev/Dockerfile: Idem
+
+	* .travis.yml (jobs): Expand to matrix
+
 2020-03-22  Mattias Ellert  <[email protected]>
 
 	* inst/include/Rcpp/exceptions_impl.h: Add include guard,

docker/ci-3.4/Dockerfile

@@ -0,0 +1,18 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM r-base:3.4.4
+
+LABEL org.label-schema.license="GPL-2.0" \
+      org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
+      maintainer="Dirk Eddelbuettel <[email protected]>"
+
+RUN apt-get update \
+        && apt-get install -y --no-install-recommends \
+                git \
+        && install.r inline pkgKitten rbenchmark tinytest
+
+ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
+ENV _R_CHECK_TESTS_NLINES_ 0
+ENV RunAllRcppTests yes
+
+CMD ["bash"]

docker/ci-3.5/Dockerfile

@@ -0,0 +1,17 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM r-base:3.5.3
+
+LABEL org.label-schema.license="GPL-2.0" \
+      org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
+      maintainer="Dirk Eddelbuettel <[email protected]>"
+
+RUN apt-get update \
+        && apt-get install -y --no-install-recommends git \
+        && install.r inline pkgKitten rbenchmark tinytest
+
+ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
+ENV _R_CHECK_TESTS_NLINES_ 0
+ENV RunAllRcppTests yes
+
+CMD ["bash"]

docker/ci-dev/Dockerfile

@@ -0,0 +1,17 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM rocker/drd
+
+LABEL org.label-schema.license="GPL-2.0" \
+      org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
+      maintainer="Dirk Eddelbuettel <[email protected]>"
+
+RUN apt-get update \
+        && apt-get install -y --no-install-recommends git \
+        && RDscript -e 'install.packages(c("inline", "pkgKitten", "rbenchmark", "tinytest"))'
+
+ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
+ENV _R_CHECK_TESTS_NLINES_ 0
+ENV RunAllRcppTests yes
+
+CMD ["bash"]

inst/NEWS.Rd

@@ -16,6 +16,11 @@
       \item Missing \code{Rcpp_list{2,3,4,5}} definition were added to
       the Rcpp namespace (Dirk fixing \ghit{1053}).
     }
+    \item Changes in Rcpp Deployment:
+    \itemize{
+      \item Travis CI unit tests now run a matrix over the versions of R
+      also tested at CRAN (rel/dev/oldrel/oldoldrel) (Dirk in \ghpr{1056}).
+    }
   }
 }