Skip to content

Commit be887e0

Browse files
committed
Remove bullseye, fedora40, alpine-3.18 for EOL
1 parent feb8a42 commit be887e0

File tree

6 files changed

+10
-45
lines changed

6 files changed

+10
-45
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IMAGE ?= rstudio/r-system-requirements
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
2+
VARIANTS ?= focal jammy noble bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse156 fedora41 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge
33

44
RULES ?= rules/*.json
55

README.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ The rules in this catalog support the following operating systems:
5252
- Red Hat Enterprise Linux 7, 8, 9
5353
- openSUSE 15.6
5454
- SUSE Linux Enterprise 15 SP6
55-
- Debian 11, 12, unstable
56-
- Fedora 40, 41
57-
- Windows (for R 4.0+ only)
55+
- Debian 12, unstable
56+
- Fedora 41
57+
- Windows (for R 4.0-4.1 only)
5858

5959
[^1]: Rocky Linux 8 is specified as `centos8` for backward compatibility.
6060
CentOS 8 reached end of support on December 31, 2021.
@@ -245,24 +245,19 @@ Available tags:
245245
- `focal` (Ubuntu 20.04)
246246
- `jammy` (Ubuntu 22.04)
247247
- `noble` (Ubuntu 24.04)
248-
- `buster` (Debian 10)
249-
- `bullseye` (Debian 11)
250248
- `bookworm` (Debian 12)
251249
- `sid` (Debian unstable)
252250
- `centos7` (CentOS 7)
253251
- `centos8` (Rocky Linux 8)
254252
- `rockylinux9` (Rocky Linux 9)
255-
- `opensuse155` (openSUSE 15.5)
256-
- `fedora36` (Fedora 36)
257-
- `fedora37` (Fedora 37)
258-
- `fedora38` (Fedora 38)
259-
- `fedora39` (Fedora 39)
253+
- `opensuse156` (openSUSE 15.6)
254+
- `fedora41` (Fedora 41)
260255

261256
To build the images:
262257

263258
```sh
264-
# Build a specific image (e.g. focal)
265-
make build-focal
259+
# Build a specific image (e.g. noble)
260+
make build-noble
266261

267262
# Build all images
268263
make build-all
@@ -271,8 +266,8 @@ make build-all
271266
To test the rules:
272267

273268
```sh
274-
# Test a specific rule on an OS (e.g. focal)
275-
make test-focal RULES=rules/libcurl.json
269+
# Test a specific rule on an OS (e.g. noble)
270+
make test-noble RULES=rules/libcurl.json
276271

277272
# Test a specific rule on all OSs
278273
make test-all RULES=rules/libcurl.json

docker/alpine-3.18/Dockerfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

docker/bullseye/Dockerfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

docker/fedora40/Dockerfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

test/test-packages.sh

Lines changed: 0 additions & 6 deletions
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-
[bullseye]='debian'
1211
[bookworm]='debian'
1312
[sid]='debian'
1413
[centos7]='centos'
@@ -20,9 +19,7 @@ declare -A os_identifiers=(
2019
[rhel9]='redhat'
2120
[opensuse156]='opensuse'
2221
[sle156]='sle'
23-
[fedora40]='fedora'
2422
[fedora41]='fedora'
25-
[alpine-3.18]='alpine'
2623
[alpine-3.19]='alpine'
2724
[alpine-3.20]='alpine'
2825
[alpine-3.21]='alpine'
@@ -33,7 +30,6 @@ declare -A versions=(
3330
[focal]='20.04'
3431
[jammy]='22.04'
3532
[noble]='24.04'
36-
[bullseye]='11'
3733
[bookworm]='12'
3834
[sid]='unstable'
3935
[centos7]='7'
@@ -45,9 +41,7 @@ declare -A versions=(
4541
[rhel9]='9'
4642
[opensuse156]='15.6'
4743
[sle156]='15.6'
48-
[fedora40]='40'
4944
[fedora41]='41'
50-
[alpine-3.18]='3.18'
5145
[alpine-3.19]='3.19'
5246
[alpine-3.20]='3.20'
5347
[alpine-3.21]='3.21'

0 commit comments

Comments
 (0)