From 191eaba00c1f09ed7c11c5f83efb4c5f1032db79 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 1 Jul 2023 07:01:11 -0500 Subject: [PATCH 1/2] Add a missing -f to one rm, add 4.2 branch --- .github/workflows/ci.yaml | 3 +++ docker/ci-4.2/Dockerfile | 17 +++++++++++++++++ docker/ci-dev/Dockerfile | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 docker/ci-4.2/Dockerfile diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9281c0a76..f2e018173 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,6 +25,9 @@ jobs: - name: release cntr: rcpp/ci r: R + - name: r-4.2 + cntr: rcpp/ci-4.2 + r: R - name: r-4.1 cntr: rcpp/ci-4.1 r: R diff --git a/docker/ci-4.2/Dockerfile b/docker/ci-4.2/Dockerfile new file mode 100644 index 000000000..01cecbc16 --- /dev/null +++ b/docker/ci-4.2/Dockerfile @@ -0,0 +1,17 @@ +## Emacs, make this -*- mode: sh; -*- + +FROM r-base:4.2.3 + +LABEL org.label-schema.license="GPL-2.0" \ + org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \ + maintainer="Dirk Eddelbuettel " + +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"] diff --git a/docker/ci-dev/Dockerfile b/docker/ci-dev/Dockerfile index 233763470..66d8cb71f 100644 --- a/docker/ci-dev/Dockerfile +++ b/docker/ci-dev/Dockerfile @@ -6,7 +6,7 @@ LABEL org.label-schema.license="GPL-2.0" \ org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \ maintainer="Dirk Eddelbuettel " -RUN rm /etc/apt/sources.list.d/experimental.list \ +RUN rm -f /etc/apt/sources.list.d/experimental.list \ && apt update -y \ && apt install -y --no-install-recommends git \ && RDscript -e 'install.packages(c("codetools", "inline", "pkgKitten", "rbenchmark", "tinytest"))' From 0d124ee984efcb5e95b7b22f649550c9f57dd71b Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 1 Jul 2023 07:12:51 -0500 Subject: [PATCH 2/2] Update Changelog for docker update [ci skip] --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index b8818d2be..b8c21ae42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-07-01 Dirk Eddelbuettel + + * docker/ci-dev/Dockerfile: Make 'rm' more robust as 'rm -f' + * docker/ci-4.2/Dockerfile: Add new container for R 4.2.3 + * .github/workflows/ci.yaml (jobs): Add entry for R 4.2.3 + 2023-06-12 Dirk Eddelbuettel * DESCRIPTION (Version, Date): Roll micro version