routine updates to Docker-based CI setup

RcppCore · Jul 10, 2022 · e1dedab · e1dedab
1 parent 5c4ba5a
commit e1dedab
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,6 +19,9 @@ jobs:
           - name: release
             cntr: rcpp/ci
             r: R
+          - name: r-4.1
+            cntr: rcpp/ci-4.1
+            r: R
           - name: r-4.0
             cntr: rcpp/ci-4.0
             r: R

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tag: [ci, ci-dev, ci-4.0]
+        tag: [ci, ci-dev]
 
     steps:
     - name: Checkout

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2022-07-10  Dirk Eddelbuettel  <edd@debian.org>
+
+	* docker/ci-4.1/Dockerfile: Add Dockerfile for 4.1 series
+	* .github/workflows/ci.yaml: Add 4.1 to CI matrix
+	* .github/workflows/docker.yaml: Do not rebuild versioned ones
+
 2022-07-02  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION (Date, Version): Release 1.0.9

diff --git a/docker/ci-4.1/Dockerfile b/docker/ci-4.1/Dockerfile
@@ -0,0 +1,17 @@
+## Emacs, make this -*- mode: sh; -*-
+
+FROM r-base:4.1.3
+
+LABEL org.label-schema.license="GPL-2.0" \
+      org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
+      maintainer="Dirk Eddelbuettel <edd@debian.org>"
+
+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"]