Skip to content

Commit 30a499c

Browse files
authored
Merge pull request #1269 from RcppCore/de/docker_update
Add a missing -f to one rm, add 4.2 branch
2 parents 3456999 + 0d124ee commit 30a499c

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ jobs:
2525
- name: release
2626
cntr: rcpp/ci
2727
r: R
28+
- name: r-4.2
29+
cntr: rcpp/ci-4.2
30+
r: R
2831
- name: r-4.1
2932
cntr: rcpp/ci-4.1
3033
r: R

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2023-07-01 Dirk Eddelbuettel <[email protected]>
2+
3+
* docker/ci-dev/Dockerfile: Make 'rm' more robust as 'rm -f'
4+
* docker/ci-4.2/Dockerfile: Add new container for R 4.2.3
5+
* .github/workflows/ci.yaml (jobs): Add entry for R 4.2.3
6+
17
2023-06-12 Dirk Eddelbuettel <[email protected]>
28

39
* DESCRIPTION (Version, Date): Roll micro version

docker/ci-4.2/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## Emacs, make this -*- mode: sh; -*-
2+
3+
FROM r-base:4.2.3
4+
5+
LABEL org.label-schema.license="GPL-2.0" \
6+
org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
7+
maintainer="Dirk Eddelbuettel <[email protected]>"
8+
9+
RUN apt-get update \
10+
&& apt-get install -y --no-install-recommends git \
11+
&& install.r inline pkgKitten rbenchmark tinytest
12+
13+
ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
14+
ENV _R_CHECK_TESTS_NLINES_ 0
15+
ENV RunAllRcppTests yes
16+
17+
CMD ["bash"]

docker/ci-dev/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL org.label-schema.license="GPL-2.0" \
66
org.label-schema.vcs-url="https://github.com/RcppCore/Rcpp" \
77
maintainer="Dirk Eddelbuettel <[email protected]>"
88

9-
RUN rm /etc/apt/sources.list.d/experimental.list \
9+
RUN rm -f /etc/apt/sources.list.d/experimental.list \
1010
&& apt update -y \
1111
&& apt install -y --no-install-recommends git \
1212
&& RDscript -e 'install.packages(c("codetools", "inline", "pkgKitten", "rbenchmark", "tinytest"))'

0 commit comments

Comments
 (0)