Merge branch 'main' of https://github.com/r-lib/rig into r-lib-main

r-lib · Jul 19, 2024 · f8a8017 · f8a8017
2 parents 2755800 + 77b9026
commit f8a8017
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 96 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -224,8 +224,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: macOS-11 }
           - { os: macos-12 }
+          - { os: macos-13 }
+          - { os: macos-14 }
 
     steps:
 

diff --git a/Makefile b/Makefile
@@ -92,7 +92,7 @@ linux-in-docker:
 		-e LOCAL_UID=`id -u` -e LOCAL_GID=`id -g` \
 		rlib/rig-builder:latest make linux
 
-VARIANTS = ubuntu-20.04 ubuntu-22.04 debian-11 debian-12 centos-7 rockylinux-8 rockylinux-9 opensuse/leap-15.4 opensuse/leap-15.5 fedora-38 fedora-39 almalinux-8 almalinux-9
+VARIANTS = ubuntu-20.04 ubuntu-22.04 debian-11 debian-12 rockylinux-8 rockylinux-9 opensuse/leap-15.4 opensuse/leap-15.5 fedora-38 fedora-39 almalinux-8 almalinux-9
 print-linux-variants:
 	@echo $(VARIANTS)
 print-linux-variants-json:

diff --git a/README.Rmd b/README.Rmd
@@ -74,7 +74,7 @@ Found another issue? Please report it in our
 * [Linux](#id-linux)
   * [Supported Linux distributions](#id-supported-linux-distributions)
   * [Ubuntu and Debian (DEB package)](#id-ubuntu-and-debian-deb-package)
-  * [RHEL, Fedora, CentOS, Rocky Linux, Almalinux, etc. (RPM package)](#id-rhel-fedora-centos-rocky-linux-almalinux-etc-rpm-package)
+  * [RHEL, Fedora, Rocky Linux, Almalinux, etc. (RPM package)](#id-rhel-fedora-rocky-linux-almalinux-etc-rpm-package)
   * [OpenSUSE and SLES (RPM package)](#id-opensuse-and-sles-rpm-package)
   * [Tarball on any supported distro](#id-linux-targz)
 * [Auto-complete](#id-auto-complete)
@@ -171,11 +171,10 @@ On Linux you can install rig from a DEB or RPM package, or from a tarball.
 #### Supported Linux distributions <a id="id-supported-linux-distributions">
 
 - Debian 10, 11, 12,
-- Ubuntu 18.04, 20.04, 22.04,
-- Fedora Linux 37, 38, 39,
-- OpenSUSE 15.3, 15.4, 15.5,
-- SUSE Linux Enterprise 15 SP3, SP4, SP5,
-- CentOS 7,
+- Ubuntu 20.04, 22.04,
+- Fedora Linux 39, 40
+- OpenSUSE 15.5,
+- SUSE Linux Enterprise 15 SP5,
 - Red Hat Enterprise Linux 7, 8, 9,
 - AlmaLinux 8, 9,
 - Rocky Linux 8, 9.
@@ -204,7 +203,7 @@ package (`rig` is a different package in Debian and Ubuntu):
 `which sudo` apt install r-rig
 ```
 
-#### Installing rig on RHEL, Fedora, CentOS, Rocky Linux, Almalinux, etc. (RPM package) <a id="id-rhel-fedora-centos-rocky-linux-almalinux-etc-rpm-package">
+#### Installing rig on RHEL, Fedora, Rocky Linux, Almalinux, etc. (RPM package) <a id="id-rhel-fedora-rocky-linux-almalinux-etc-rpm-package">
 
 On most RPM based distros (except for OpenSUSE and SLES) you can install
 our RPM package directly:
@@ -374,14 +373,12 @@ Name                                      | OS                 | R version
 `ghcr.io/r-lib/rig/debian-11-devel`       | Debian 11          | devel (daily)  |
 `ghcr.io/r-lib/rig/debian-10-release`     | Debian 10          | release        | `debian-10`
 `ghcr.io/r-lib/rig/debian-10-devel`       | Debian 10          | devel (daily)  |
-`ghcr.io/r-lib/rig/fedora-39-release`     | Fedora 39          | release        | `fedora`, `fedora-release`, `fedora-latest`, `fedora-latest-release`, `fedora-39`
-`ghcr.io/r-lib/rig/fedora-39-devel`       | Fedora 39          | devel          | `fedora-devel`, `fedora-latest-devel`
-`ghcr.io/r-lib/rig/fedora-38-release`     | Fedora 38          | release        | `fedora-38`
-`ghcr.io/r-lib/rig/fedora-38-devel`       | Fedora 38          | devel          |
+`ghcr.io/r-lib/rig/fedora-40-release`     | Fedora 40          | release        | `fedora`, `fedora-release`, `fedora-latest`, `fedora-latest-release`, `fedora-40`
+`ghcr.io/r-lib/rig/fedora-40-devel`       | Fedora 40          | devel          | `fedora-devel`, `fedora-latest-devel`
+`ghcr.io/r-lib/rig/fedora-39-release`     | Fedora 39          | release        | `fedora-39`
+`ghcr.io/r-lib/rig/fedora-39-devel`       | Fedora 39          | devel          |
 `ghcr.io/r-lib/rig/opensuse-15.5-release` | OpenSUSE Leap 15.5 | release        | `opensuse`, `opensuse-release`, `opensuse-latest`, `opensuse-latest-release`, `opensuse-15.5`
 `ghcr.io/r-lib/rig/opensuse-15.5-devel`   | OpenSUSE Leap 15.5 | devel (daily)  | `opensuse-devel`, `opensuse-latest-devel`
-`ghcr.io/r-lib/rig/opensuse-15.4-release` | OpenSUSE Leap 15.4 | release        | `opensuse-15.4`
-`ghcr.io/r-lib/rig/opensuse-15.4-devel`   | OpenSUSE Leap 15.4 | devel (daily)  |
 
 For convenience, we also create these tags:
 
@@ -402,14 +399,13 @@ Tag                                | Image                   | Description
 `ghcr.io/r-lib/rig/debian-devel`   | `debian-12-devel`       | R devel on latest Debian.
 `ghcr.io/r-lib/rig/debian-11`      | `debian-11-release`     | Latest R release on Debian 11.
 `ghcr.io/r-lib/rig/debian-10`      | `debian-10-release`     | Latest R release on Debian 10.
-`ghcr.io/r-lib/rig/fedora`         | `fedora-39-release`     | Latest R release on latest Fedora.
+`ghcr.io/r-lib/rig/fedora`         | `fedora-40-release`     | Latest R release on latest Fedora.
+`ghcr.io/r-lib/rig/fedora-40`      | `fedora-40-release`     | Latest R release on Fedora 40.
+`ghcr.io/r-lib/rig/fedora-devel`   | `fedora-40-devel`       | R devel on latest Fedora.
 `ghcr.io/r-lib/rig/fedora-39`      | `fedora-39-release`     | Latest R release on Fedora 39.
-`ghcr.io/r-lib/rig/fedora-devel`   | `fedora-39-devel`       | R devel on latest Fedora.
-`ghcr.io/r-lib/rig/fedora-38`      | `fedora-38-release`     | Latest R release on Fedora 38.
 `ghcr.io/r-lib/rig/opensuse`       | `opensuse-15.5-release` | Latest R release on latest OpenSUSE.
 `ghcr.io/r-lib/rig/opensuse-15.5`  | `opensuse-15.5-release` | Latest R release on OpenSUSE 15.5.
 `ghcr.io/r-lib/rig/opensuse-devel` | `opensuse-15.5-devel`   | R devel on latest OpenSUSE.
-`ghcr.io/r-lib/rig/opensuse-15.4`  | `opensuse-15.4-release` | Latest R release on OpenSUSE 15.4.
 
 See all container images on
 [GitHub](https://github.com/orgs/r-lib/packages?repo_name=rig).

diff --git a/README.md b/README.md
@@ -72,8 +72,7 @@ tracker](https://github.com/r-lib/rig/issues).
   - [Supported Linux distributions](#id-supported-linux-distributions)
   - [Ubuntu and Debian (DEB package)](#id-ubuntu-and-debian-deb-package)
   - [Pop!_OS (DEB package)](#id-popos-deb-package)
-  - [RHEL, Fedora, CentOS, Rocky Linux, Almalinux, etc. (RPM
-    package)](#id-rhel-fedora-centos-rocky-linux-almalinux-etc-rpm-package)
+  - [RHEL, Fedora, Rocky Linux, Almalinux, etc. (RPM package)](#id-rhel-fedora-rocky-linux-almalinux-etc-rpm-package)
   - [OpenSUSE and SLES (RPM package)](#id-opensuse-and-sles-rpm-package)
   - [Tarball on any supported distro](#id-linux-targz)
 - [Auto-complete](#id-auto-complete)
@@ -170,11 +169,10 @@ tarball.
 #### Supported Linux distributions <a id="id-supported-linux-distributions">
 
 - Debian 10, 11, 12,
-- Ubuntu 18.04, 20.04, 22.04,
-- Fedora Linux 37, 38, 39,
-- OpenSUSE 15.3, 15.4, 15.5,
-- SUSE Linux Enterprise 15 SP3, SP4, SP5,
-- CentOS 7,
+- Ubuntu 20.04, 22.04,
+- Fedora Linux 39, 40
+- OpenSUSE 15.5,
+- SUSE Linux Enterprise 15 SP5,
 - Red Hat Enterprise Linux 7, 8, 9,
 - AlmaLinux 8, 9,
 - Rocky Linux 8, 9.
@@ -228,7 +226,7 @@ For ZSH you can manually set the RIG_PLATFORM by editing your environment variab
     `which sudo` echo -e 'export RIG_PLATFORM="ubuntu-22.04"' >> ~/.zprofile
     `which sudo` source ~/.zprofile
 
-#### Installing rig on RHEL, Fedora, CentOS, Rocky Linux, Almalinux, etc. (RPM package) <a id="id-rhel-fedora-centos-rocky-linux-almalinux-etc-rpm-package">
+#### Installing rig on RHEL, Fedora, Rocky Linux, Almalinux, etc. (RPM package) <a id="id-rhel-fedora-rocky-linux-almalinux-etc-rpm-package">
 
 On most RPM based distros (except for OpenSUSE and SLES) you can install
 our RPM package directly:
@@ -379,14 +377,12 @@ containers:
 | `ghcr.io/r-lib/rig/debian-11-devel`       | Debian 11          | devel (daily)  |                                                                                                 |
 | `ghcr.io/r-lib/rig/debian-10-release`     | Debian 10          | release        | `debian-10`                                                                                     |
 | `ghcr.io/r-lib/rig/debian-10-devel`       | Debian 10          | devel (daily)  |                                                                                                 |
-| `ghcr.io/r-lib/rig/fedora-39-release`     | Fedora 39          | release        | `fedora`, `fedora-release`, `fedora-latest`, `fedora-latest-release`, `fedora-39`               |
-| `ghcr.io/r-lib/rig/fedora-39-devel`       | Fedora 39          | devel          | `fedora-devel`, `fedora-latest-devel`                                                           |
-| `ghcr.io/r-lib/rig/fedora-38-release`     | Fedora 38          | release        | `fedora-38`                                                                                     |
-| `ghcr.io/r-lib/rig/fedora-38-devel`       | Fedora 38          | devel          |                                                                                                 |
+| `ghcr.io/r-lib/rig/fedora-40-release`     | Fedora 40          | release        | `fedora`, `fedora-release`, `fedora-latest`, `fedora-latest-release`, `fedora-40`               |
+| `ghcr.io/r-lib/rig/fedora-40-devel`       | Fedora 40          | devel          | `fedora-devel`, `fedora-latest-devel`                                                           |
+| `ghcr.io/r-lib/rig/fedora-39-release`     | Fedora 39          | release        | `fedora-39`                                                                                     |
+| `ghcr.io/r-lib/rig/fedora-39-devel`       | Fedora 39          | devel          |                                                                                                 |
 | `ghcr.io/r-lib/rig/opensuse-15.5-release` | OpenSUSE Leap 15.5 | release        | `opensuse`, `opensuse-release`, `opensuse-latest`, `opensuse-latest-release`, `opensuse-15.5`   |
 | `ghcr.io/r-lib/rig/opensuse-15.5-devel`   | OpenSUSE Leap 15.5 | devel (daily)  | `opensuse-devel`, `opensuse-latest-devel`                                                       |
-| `ghcr.io/r-lib/rig/opensuse-15.4-release` | OpenSUSE Leap 15.4 | release        | `opensuse-15.4`                                                                                 |
-| `ghcr.io/r-lib/rig/opensuse-15.4-devel`   | OpenSUSE Leap 15.4 | devel (daily)  |                                                                                                 |
 
 For convenience, we also create these tags:
 
@@ -407,14 +403,13 @@ For convenience, we also create these tags:
 | `ghcr.io/r-lib/rig/debian-devel`   | `debian-12-devel`       | R devel on latest Debian.            |
 | `ghcr.io/r-lib/rig/debian-11`      | `debian-11-release`     | Latest R release on Debian 11.       |
 | `ghcr.io/r-lib/rig/debian-10`      | `debian-10-release`     | Latest R release on Debian 10.       |
-| `ghcr.io/r-lib/rig/fedora`         | `fedora-39-release`     | Latest R release on latest Fedora.   |
+| `ghcr.io/r-lib/rig/fedora`         | `fedora-40-release`     | Latest R release on latest Fedora.   |
+| `ghcr.io/r-lib/rig/fedora-40`      | `fedora-40-release`     | Latest R release on Fedora 40.       |
+| `ghcr.io/r-lib/rig/fedora-devel`   | `fedora-40-devel`       | R devel on latest Fedora.            |
 | `ghcr.io/r-lib/rig/fedora-39`      | `fedora-39-release`     | Latest R release on Fedora 39.       |
-| `ghcr.io/r-lib/rig/fedora-devel`   | `fedora-39-devel`       | R devel on latest Fedora.            |
-| `ghcr.io/r-lib/rig/fedora-38`      | `fedora-38-release`     | Latest R release on Fedora 38.       |
 | `ghcr.io/r-lib/rig/opensuse`       | `opensuse-15.5-release` | Latest R release on latest OpenSUSE. |
 | `ghcr.io/r-lib/rig/opensuse-15.5`  | `opensuse-15.5-release` | Latest R release on OpenSUSE 15.5.   |
 | `ghcr.io/r-lib/rig/opensuse-devel` | `opensuse-15.5-devel`   | R devel on latest OpenSUSE.          |
-| `ghcr.io/r-lib/rig/opensuse-15.4`  | `opensuse-15.4-release` | Latest R release on OpenSUSE 15.4.   |
 
 See all container images on
 [GitHub](https://github.com/orgs/r-lib/packages?repo_name=rig).

diff --git a/containers/matrix.json b/containers/matrix.json
@@ -19,6 +19,45 @@
             "ghcr.io/r-lib/rig/ubuntu-multi:latest"
         ]
     },
+    {
+        "name": "ubuntu-24.04-release",
+        "aliases": [
+            "ubuntu-24.04-release",
+            "ubuntu",
+            "ubuntu-24.04",
+            "ubuntu-release",
+            "release"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=ubuntu",
+            "RELEASE=24.04",
+            "RVERSION=release"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/ubuntu-24.04-release:latest",
+            "ghcr.io/r-lib/rig/ubuntu-24.04:latest"
+        ]
+    },
+    {
+        "name": "ubuntu-24.04-devel",
+        "aliases": [
+            "ubuntu-24.04-devel",
+            "ubuntu",
+            "ubuntu-24.04",
+            "ubuntu-devel",
+            "devel"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=ubuntu",
+            "RELEASE=24.04",
+            "RVERSION=devel"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/ubuntu-24.04-devel:latest"
+        ]
+    },
     {
         "name": "ubuntu-22.04-release",
         "aliases": [
@@ -229,83 +268,83 @@
         ]
     },
     {
-        "name": "fedora-39-release",
+        "name": "fedora-40-release",
         "aliases": [
-            "fedora-39-release",
+            "fedora-40-release",
             "fedora",
-            "fedora-39",
+            "fedora-40",
             "fedora-release",
             "release"
         ],
         "dir": "fedora",
         "args": [
-            "RELEASE=39",
+            "RELEASE=40",
             "RVERSION=release"
         ],
         "tags": [
-            "ghcr.io/r-lib/rig/fedora-39-release:latest",
-            "ghcr.io/r-lib/rig/fedora-39:latest",
+            "ghcr.io/r-lib/rig/fedora-40-release:latest",
+            "ghcr.io/r-lib/rig/fedora-40:latest",
             "ghcr.io/r-lib/rig/fedora-latest-release:latest",
             "ghcr.io/r-lib/rig/fedora-latest:latest",
             "ghcr.io/r-lib/rig/fedora-release:latest",
             "ghcr.io/r-lib/rig/fedora:latest"
         ]
     },
     {
-        "name": "fedora-39-devel",
+        "name": "fedora-40-devel",
         "aliases": [
-            "fedora-39-devel",
+            "fedora-40-devel",
             "fedora",
-            "fedora-39",
+            "fedora-40",
             "fedora-devel",
             "devel"
         ],
         "dir": "fedora",
         "args": [
-            "RELEASE=39",
+            "RELEASE=40",
             "RVERSION=devel"
         ],
         "tags": [
-            "ghcr.io/r-lib/rig/fedora-39-devel:latest",
+            "ghcr.io/r-lib/rig/fedora-40-devel:latest",
             "ghcr.io/r-lib/rig/fedora-latest-devel:latest",
             "ghcr.io/r-lib/rig/fedora-devel:latest"
         ]
     },
     {
-        "name": "fedora-38-release",
+        "name": "fedora-39-release",
         "aliases": [
-            "fedora-38-release",
+            "fedora-39-release",
             "fedora",
-            "fedora-38",
+            "fedora-39",
             "fedora-release",
             "release"
         ],
         "dir": "fedora",
         "args": [
-            "RELEASE=38",
+            "RELEASE=39",
             "RVERSION=release"
         ],
         "tags": [
-            "ghcr.io/r-lib/rig/fedora-38-release:latest",
-            "ghcr.io/r-lib/rig/fedora-38:latest"
+            "ghcr.io/r-lib/rig/fedora-39-release:latest",
+            "ghcr.io/r-lib/rig/fedora-39:latest"
         ]
     },
     {
-        "name": "fedora-38-devel",
+        "name": "fedora-39-devel",
         "aliases": [
-            "fedora-38-devel",
+            "fedora-39-devel",
             "fedora",
-            "fedora-38",
+            "fedora-39",
             "fedora-devel",
             "devel"
         ],
         "dir": "fedora",
         "args": [
-            "RELEASE=38",
+            "RELEASE=39",
             "RVERSION=devel"
         ],
         "tags": [
-            "ghcr.io/r-lib/rig/fedora-38-devel:latest"
+            "ghcr.io/r-lib/rig/fedora-39-devel:latest"
         ]
     },
     {
@@ -350,42 +389,5 @@
             "ghcr.io/r-lib/rig/opensuse-latest-devel:latest",
             "ghcr.io/r-lib/rig/opensuse-devel:latest"
         ]
-    },
-    {
-        "name": "opensuse-15.4-release",
-        "aliases": [
-            "opensuse-15.4-release",
-            "opensuse",
-            "opensuse-15.4",
-            "opensuse-release",
-            "release"
-        ],
-        "dir": "suse",
-        "args": [
-            "RELEASE=15.4",
-            "RVERSION=release"
-        ],
-        "tags": [
-            "ghcr.io/r-lib/rig/opensuse-15.4-release:latest",
-            "ghcr.io/r-lib/rig/opensuse-15.4:latest"
-        ]
-    },
-    {
-        "name": "opensuse-15.4-devel",
-        "aliases": [
-            "opensuse-15.4-devel",
-            "opensuse",
-            "opensuse-15.4",
-            "opensuse-devel",
-            "devel"
-        ],
-        "dir": "suse",
-        "args": [
-            "RELEASE=15.4",
-            "RVERSION=devel"
-        ],
-        "tags": [
-            "ghcr.io/r-lib/rig/opensuse-15.4-devel:latest"
-        ]
     }
 ]