Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fedora 41 support #194

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IMAGE ?= rstudio/r-system-requirements
VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 opensuse156 fedora38 fedora39 fedora40 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge
VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 opensuse156 fedora39 fedora40 fedora41 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge

RULES ?= rules/*.json

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The rules in this catalog support the following operating systems:
- openSUSE 15.5, 15.6
- SUSE Linux Enterprise 15 SP5, 15 SP6
- Debian 10, 11, 12, unstable
- Fedora 38, 39, 40
- Fedora 39, 40, 41
- Windows (for R 4.0+ only)

[^1]: Rocky Linux 8 is specified as `centos8` for backward compatibility.
Expand Down
2 changes: 1 addition & 1 deletion docker/fedora38/Dockerfile → docker/fedora41/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:38
FROM fedora:41

RUN dnf upgrade -y -q && \
dnf install -y glibc-langpack-en
Expand Down
3 changes: 2 additions & 1 deletion schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@
"37",
"38",
"39",
"40"
"40",
"41"
]
},
"alpine": {
Expand Down
2 changes: 1 addition & 1 deletion systems.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{
"os": "linux",
"distribution": "fedora",
"versions": [ "36", "37", "38", "39", "40" ]
"versions": [ "36", "37", "38", "39", "40", "41" ]
},
{
"os": "linux",
Expand Down
4 changes: 2 additions & 2 deletions test/test-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ declare -A os_identifiers=(
[opensuse156]='opensuse'
[sle155]='sle'
[sle156]='sle'
[fedora38]='fedora'
[fedora39]='fedora'
[fedora40]='fedora'
[fedora41]='fedora'
[alpine-3.17]='alpine'
[alpine-3.18]='alpine'
[alpine-3.19]='alpine'
Expand All @@ -50,9 +50,9 @@ declare -A versions=(
[opensuse156]='15.6'
[sle155]='15.5'
[sle156]='15.6'
[fedora38]='38'
[fedora39]='39'
[fedora40]='40'
[fedora41]='41'
[alpine-3.17]='3.17'
[alpine-3.18]='3.18'
[alpine-3.19]='3.19'
Expand Down
Loading