From 69b6e4cec5b8b0ca0a7a71550126c29ec29c4b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sun, 23 Jun 2024 13:59:16 +0200 Subject: [PATCH 1/5] Container updates - remove OpenSUSE 15.4, EOL - remove Fedora 38, EOL - add Fedora 40 [ci skip] --- containers/matrix.json | 81 ++++++++++++------------------------------ 1 file changed, 22 insertions(+), 59 deletions(-) diff --git a/containers/matrix.json b/containers/matrix.json index 60a1f9d..9496978 100644 --- a/containers/matrix.json +++ b/containers/matrix.json @@ -229,22 +229,22 @@ ] }, { - "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", @@ -252,60 +252,60 @@ ] }, { - "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 +350,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" - ] } ] From 74a21647dc5a01ff6e5e6f01c0cd3dcad173cd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sun, 23 Jun 2024 15:10:19 +0200 Subject: [PATCH 2/5] Update supported distros in README [ci skip] --- README.Rmd | 25 +++++++++++-------------- README.md | 25 +++++++++++-------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/README.Rmd b/README.Rmd index 08c7c3e..397605d 100644 --- a/README.Rmd +++ b/README.Rmd @@ -171,10 +171,10 @@ On Linux you can install rig from a DEB or RPM package, or from a tarball. #### 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, +- Ubuntu 20.04, 22.04, +- Fedora Linux 39, 40 +- OpenSUSE 15.5, +- SUSE Linux Enterprise 15 SP5, - CentOS 7, - Red Hat Enterprise Linux 7, 8, 9, - AlmaLinux 8, 9, @@ -374,14 +374,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 +400,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 index 8de657d..b3836a2 100644 --- a/README.md +++ b/README.md @@ -169,10 +169,10 @@ tarball. #### 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, +- Ubuntu 20.04, 22.04, +- Fedora Linux 39, 40 +- OpenSUSE 15.5, +- SUSE Linux Enterprise 15 SP5, - CentOS 7, - Red Hat Enterprise Linux 7, 8, 9, - AlmaLinux 8, 9, @@ -349,14 +349,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: @@ -377,14 +375,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). From aecb3e65508cf3e76a629e82bf65120a00655da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Fri, 19 Jul 2024 18:13:27 +0200 Subject: [PATCH 3/5] Containers: build release/devel on Ubuntu 24.04 --- containers/matrix.json | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/containers/matrix.json b/containers/matrix.json index 9496978..f2e55d7 100644 --- 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": [ From 5b78767b6024f097587a7ec5d9362f98f2d3bfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Fri, 19 Jul 2024 18:17:58 +0200 Subject: [PATCH 4/5] Remove CentOS support All CentOS releases are EOL now. --- Makefile | 2 +- README.Rmd | 5 ++--- README.md | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2cd0079..22bbd69 100644 --- 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 index 397605d..b02ec87 100644 --- 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) @@ -175,7 +175,6 @@ On Linux you can install rig from a DEB or RPM package, or from a tarball. - Fedora Linux 39, 40 - OpenSUSE 15.5, - SUSE Linux Enterprise 15 SP5, -- CentOS 7, - 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) +#### Installing rig on 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: diff --git a/README.md b/README.md index b3836a2..0702e9b 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,8 @@ tracker](https://github.com/r-lib/rig/issues). - [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) @@ -173,7 +173,6 @@ tarball. - Fedora Linux 39, 40 - OpenSUSE 15.5, - SUSE Linux Enterprise 15 SP5, -- CentOS 7, - Red Hat Enterprise Linux 7, 8, 9, - AlmaLinux 8, 9, - Rocky Linux 8, 9. @@ -198,7 +197,7 @@ If you already added both the key and the repository, then install the `which sudo` apt update `which sudo` apt install r-rig -#### Installing rig on RHEL, Fedora, CentOS, Rocky Linux, Almalinux, etc. (RPM package) +#### Installing rig on 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: From 77b90261f97033f5b1e3b269834bf65a161c2a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Fri, 19 Jul 2024 18:18:38 +0200 Subject: [PATCH 5/5] Do not test on macOS 11, but test on 13, 14 --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4e7ed94..82594b8 100644 --- 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: