Merge branch 'main' into pak

r-hub · Apr 17, 2024 · 35f4693 · 35f4693
2 parents 07ee5fb + 9cf384f
commit 35f4693
Show file tree

Hide file tree

Showing 10 changed files with 1,469 additions and 2,251 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE ?= rstudio/r-system-requirements
-VARIANTS ?= focal jammy buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse154 opensuse155 fedora36 fedora37 fedora38 fedora39 alpine-3.16 alpine-3.17 alpine-3.18 alpine-3.19 alpine-edge
+VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse154 opensuse155 fedora36 fedora37 fedora38 fedora39 alpine-3.16 alpine-3.17 alpine-3.18 alpine-3.19 alpine-edge
 
 RULES ?= rules/*.json
 

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ Both tests run with R 3.5.3 for all CRAN packages as of April 4, 2019.
 
 The rules in this catalog support the following operating systems:
 
-- Ubuntu 20.04, 22.04
+- Ubuntu 20.04, 22.04, 24.04
 - CentOS 7
 - Rocky Linux 8*, 9
 - Red Hat Enterprise Linux 7, 8, 9
@@ -285,6 +285,7 @@ packages on supported OSs.
 Available tags:
 - `focal` (Ubuntu 20.04)
 - `jammy` (Ubuntu 22.04)
+- `noble` (Ubuntu 24.04)
 - `buster` (Debian 10)
 - `bullseye` (Debian 11)
 - `bookworm` (Debian 12)

diff --git a/docker/noble/Dockerfile b/docker/noble/Dockerfile
@@ -0,0 +1,8 @@
+FROM ubuntu:noble
+
+RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y curl
+
+# Install jq
+RUN curl -fsSL -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \
+    chmod +x /usr/local/bin/jq
diff --git a/rules/libgit2.json b/rules/libgit2.json
@@ -22,7 +22,7 @@
         {
           "os": "linux",
           "distribution": "ubuntu",
-          "versions": ["20.04", "22.04"]
+          "versions": ["20.04", "22.04", "24.04"]
         },
         {
           "os": "linux",

diff --git a/rules/pandoc-citeproc.json b/rules/pandoc-citeproc.json
@@ -6,7 +6,8 @@
         "constraints": [
           {
             "os": "linux",
-            "distribution": "ubuntu"
+            "distribution": "ubuntu",
+            "versions": ["14.04", "16.04", "18.04", "20.04", "22.04"]
           },
           {
             "os": "linux",

diff --git a/rules/v8.json b/rules/v8.json
@@ -7,7 +7,7 @@
         {
           "os": "linux",
           "distribution": "ubuntu",
-          "versions": ["20.04", "22.04"]
+          "versions": ["20.04", "22.04", "24.04"]
         },
         {
           "os": "linux",

diff --git a/schema.json b/schema.json
@@ -149,7 +149,8 @@
           "16.04",
           "18.04",
           "20.04",
-          "22.04"
+          "22.04",
+          "24.04"
         ]
       },
       "centos": {

diff --git a/systems.json b/systems.json
@@ -7,7 +7,7 @@
     {
         "os": "linux",
         "distribution": "ubuntu",
-        "versions": [ "14.04", "16.04", "18.04", "20.04", "22.04" ]
+        "versions": [ "14.04", "16.04", "18.04", "20.04", "22.04", "24.04" ]
     },
     {
         "os": "linux",