Skip to content

Commit

Permalink
Merge pull request #165 from rstudio/opensuse154-eol
Browse files Browse the repository at this point in the history
Deprecate openSUSE 15.4 for EOL
  • Loading branch information
glin authored May 3, 2024
2 parents df6d720 + d6c73e2 commit ee10eb9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 16 deletions.
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 opensuse154 opensuse155 fedora36 fedora37 fedora38 fedora39 alpine-3.16 alpine-3.17 alpine-3.18 alpine-3.19 alpine-edge
VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 fedora36 fedora37 fedora38 fedora39 alpine-3.16 alpine-3.17 alpine-3.18 alpine-3.19 alpine-edge

RULES ?= rules/*.json

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ The rules in this catalog support the following operating systems:
- CentOS 7
- Rocky Linux 8*, 9
- Red Hat Enterprise Linux 7, 8, 9
- openSUSE 15.4, 15.5
- SUSE Linux Enterprise 15 SP4, 15 SP5
- openSUSE 15.5
- SUSE Linux Enterprise 15 SP5
- Debian 10, 11, 12, unstable
- Fedora 36, 37, 38, 39
- Windows (for R 4.0+ only)
Expand Down Expand Up @@ -293,7 +293,6 @@ Available tags:
- `centos7` (CentOS 7)
- `centos8` (Rocky Linux 8)
- `rockylinux9` (Rocky Linux 9)
- `opensuse154` (openSUSE 15.4)
- `opensuse155` (openSUSE 15.5)
- `fedora36` (Fedora 36)
- `fedora37` (Fedora 37)
Expand Down
8 changes: 0 additions & 8 deletions docker/opensuse154/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions test/test-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ declare -A os_identifiers=(
[rhel7]='redhat'
[rhel8]='redhat'
[rhel9]='redhat'
[opensuse154]='opensuse'
[opensuse155]='opensuse'
[sle154]='sle'
[sle155]='sle'
[fedora36]='fedora'
[fedora37]='fedora'
Expand All @@ -47,9 +45,7 @@ declare -A versions=(
[rhel7]='7'
[rhel8]='8'
[rhel9]='9'
[opensuse154]='15.4'
[opensuse155]='15.5'
[sle154]='15.4'
[sle155]='15.5'
[fedora36]='36'
[fedora37]='37'
Expand Down

0 comments on commit ee10eb9

Please sign in to comment.