Skip to content

Commit 62fec43

Browse files
authored
Merge pull request #208 from rstudio/upkeep/eol-suse-15.5-debian-10-fedora-39
EOL for OpenSUSE 15.5, Debian 10, Fedora 39
2 parents 40aadd4 + 6f0cecb commit 62fec43

File tree

6 files changed

+5
-37
lines changed

6 files changed

+5
-37
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IMAGE ?= rstudio/r-system-requirements
2-
VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse155 opensuse156 fedora39 fedora40 fedora41 alpine-3.18 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge
2+
VARIANTS ?= focal jammy noble bullseye bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse156 fedora40 fedora41 alpine-3.18 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge
33

44
RULES ?= rules/*.json
55

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ The rules in this catalog support the following operating systems:
5050
- CentOS 7
5151
- Rocky Linux 8[^1], 9
5252
- Red Hat Enterprise Linux 7, 8, 9
53-
- openSUSE 15.5, 15.6
54-
- SUSE Linux Enterprise 15 SP5, 15 SP6
55-
- Debian 10, 11, 12, unstable
56-
- Fedora 39, 40, 41
53+
- openSUSE 15.6
54+
- SUSE Linux Enterprise 15 SP6
55+
- Debian 11, 12, unstable
56+
- Fedora 40, 41
5757
- Windows (for R 4.0+ only)
5858

5959
[^1]: Rocky Linux 8 is specified as `centos8` for backward compatibility.

docker/buster/Dockerfile

-8
This file was deleted.

docker/fedora39/Dockerfile

-8
This file was deleted.

docker/opensuse155/Dockerfile

-8
This file was deleted.

test/test-packages.sh

-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ declare -A os_identifiers=(
88
[focal]='ubuntu'
99
[jammy]='ubuntu'
1010
[noble]='ubuntu'
11-
[buster]='debian'
1211
[bullseye]='debian'
1312
[bookworm]='debian'
1413
[sid]='debian'
@@ -19,11 +18,8 @@ declare -A os_identifiers=(
1918
[rhel7]='redhat'
2019
[rhel8]='redhat'
2120
[rhel9]='redhat'
22-
[opensuse155]='opensuse'
2321
[opensuse156]='opensuse'
24-
[sle155]='sle'
2522
[sle156]='sle'
26-
[fedora39]='fedora'
2723
[fedora40]='fedora'
2824
[fedora41]='fedora'
2925
[alpine-3.18]='alpine'
@@ -37,7 +33,6 @@ declare -A versions=(
3733
[focal]='20.04'
3834
[jammy]='22.04'
3935
[noble]='24.04'
40-
[buster]='10'
4136
[bullseye]='11'
4237
[bookworm]='12'
4338
[sid]='unstable'
@@ -48,11 +43,8 @@ declare -A versions=(
4843
[rhel7]='7'
4944
[rhel8]='8'
5045
[rhel9]='9'
51-
[opensuse155]='15.5'
5246
[opensuse156]='15.6'
53-
[sle155]='15.5'
5447
[sle156]='15.6'
55-
[fedora39]='39'
5648
[fedora40]='40'
5749
[fedora41]='41'
5850
[alpine-3.18]='3.18'

0 commit comments

Comments
 (0)