Skip to content

Commit ccea4aa

Browse files
authored
Merge branch 'main' into matrix_array_matmult
2 parents d72712e + e92e1dd commit ccea4aa

24 files changed

Lines changed: 218 additions & 126 deletions

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"build": { "dockerfile": "r-devel/Dockerfile", "context": ".."}
2+
"build": { "dockerfile": "r-devel-alpine/Dockerfile", "context": ".."}
33
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ skip_if_not_installed = function(pkg) {
2626
skip_if(!requireNamespace(pkg), paste(pkg, "is not installed"))
2727
}
2828

29+
skip_if_not = function(cond, info) skip_if(!cond, info)
30+
31+
skip_unless_r = function(spec) {
32+
msg = paste("R version requirement not satisfied:", spec)
33+
spec = unlist(strsplit(trimws(spec), "\\s+"))
34+
skip_if_not(eval(parse(text = sprintf("getRversion() %s '%s'", spec[1L], spec[2L]))), msg)
35+
}
36+
2937
expect_identical = function(x, y, tolerance = NULL, ignore_attr = NULL, info = character()) {
3038
if (!is.null(ignore_attr)) {
3139
attributes(x) = attributes(x)[!names(attributes(x)) %in% ignore_attr]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/r-hub/evercran/3.4.0
1+
FROM ghcr.io/r-hub/evercran/3.5.0
22

33
RUN apt-get -qq update \
44
&& apt-get install -y --no-install-recommends git locales \
@@ -21,4 +21,4 @@ install.packages(deps); \
2121

2222
# Needed for testthat equivalency on pre-testthat R
2323
WORKDIR /root
24-
COPY .devcontainer/r-340/.Rprofile .
24+
COPY .devcontainer/r-350/.Rprofile .

.devcontainer/r-420/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM docker.io/rhub/r-minimal:devel
2+
3+
RUN apk update && \
4+
apk add --no-cache git gcc g++ linux-headers musl-dev
5+
6+
COPY DESCRIPTION .
7+
8+
RUN Rscript -e ' \
9+
read.dcf("DESCRIPTION", c("Imports", "Suggests")) |> \
10+
tools:::.split_dependencies() |> \
11+
names() |> \
12+
setdiff(tools:::.get_standard_package_names()$base) |> \
13+
install.packages() \
14+
'
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM registry.gitlab.com/rdatatable/dockerfiles/r-devel-gcc
2+
3+
RUN apt-get -qq update \
4+
&& apt-get install -y --no-install-recommends git
5+
6+
COPY DESCRIPTION .
7+
8+
RUN Rscript -e ' \
9+
read.dcf("DESCRIPTION", c("Imports", "Suggests")) |> \
10+
tools:::.split_dependencies() |> \
11+
names() |> \
12+
setdiff(tools:::.get_standard_package_names()$base) |> \
13+
install.packages() \
14+
'
File renamed without changes.

.devcontainer/r-devel/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

.devcontainer/r-devel/setup_for_full_check.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)