Skip to content

Commit

Permalink
Add openSUSE/SLES 15.5
Browse files Browse the repository at this point in the history
  • Loading branch information
glin committed Oct 4, 2023
1 parent c9d30d7 commit 502e3da
Showing 11 changed files with 30 additions and 15 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 buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse154 fedora36 fedora37 fedora38 alpine-3.15 alpine-3.16 alpine-3.17 alpine-3.18 alpine-edge
VARIANTS ?= focal jammy buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse154 opensuse155 fedora36 fedora37 fedora38 alpine-3.15 alpine-3.16 alpine-3.17 alpine-3.18 alpine-edge

RULES ?= rules/*.json

5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
- SUSE Linux Enterprise 15 SP4
- openSUSE 15.4, 15.5
- SUSE Linux Enterprise 15 SP4, 15 SP5
- Debian 10, 11, 12, unstable
- Fedora 36, 37, 38
- Windows (for R 4.0+ only)
@@ -293,6 +293,7 @@ Available tags:
- `centos8` (Rocky Linux 8)
- `rockylinux9` (Rocky Linux 9)
- `opensuse154` (openSUSE 15.4)
- `opensuse155` (openSUSE 15.5)
- `fedora36` (Fedora 36)
- `fedora37` (Fedora 37)
- `fedora38` (Fedora 38)
8 changes: 8 additions & 0 deletions docker/opensuse155/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM opensuse/leap:15.5

RUN zypper --quiet --non-interactive update && \
zypper --non-interactive install curl

# Install jq
RUN curl -fsSL -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.7/jq-linux64 && \
chmod +x /usr/local/bin/jq
4 changes: 2 additions & 2 deletions rules/java.json
Original file line number Diff line number Diff line change
@@ -90,12 +90,12 @@
{
"os": "linux",
"distribution": "opensuse",
"versions": ["15.4"]
"versions": ["15.4", "15.5"]
},
{
"os": "linux",
"distribution": "sle",
"versions": ["15.4"]
"versions": ["15.4", "15.5"]
}
]
},
2 changes: 1 addition & 1 deletion rules/libgit2.json
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@
{
"os": "linux",
"distribution": "sle",
"versions": ["15.0", "15.2", "15.3", "15.4"]
"versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
}
]
},
4 changes: 2 additions & 2 deletions rules/libicu.json
Original file line number Diff line number Diff line change
@@ -66,12 +66,12 @@
{
"os": "linux",
"distribution": "opensuse",
"versions": ["15.3", "15.4"]
"versions": ["15.3", "15.4", "15.5"]
},
{
"os": "linux",
"distribution": "sle",
"versions": ["15.3", "15.4"]
"versions": ["15.3", "15.4", "15.5"]
}
]
},
4 changes: 2 additions & 2 deletions rules/libmysqlclient.json
Original file line number Diff line number Diff line change
@@ -100,12 +100,12 @@
{
"os": "linux",
"distribution": "opensuse",
"versions": ["15.0", "15.2", "15.3", "15.4"]
"versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
},
{
"os": "linux",
"distribution": "sle",
"versions": ["15.0", "15.2", "15.3", "15.4"]
"versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
}
]
},
2 changes: 1 addition & 1 deletion rules/proj.json
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@
{
"os": "linux",
"distribution": "opensuse",
"versions": ["15.2", "15.3", "15.4"]
"versions": ["15.2", "15.3", "15.4", "15.5"]
}
]
},
6 changes: 4 additions & 2 deletions schema.json
Original file line number Diff line number Diff line change
@@ -178,7 +178,8 @@
"15.0",
"15.2",
"15.3",
"15.4"
"15.4",
"15.5"
]
},
"sle": {
@@ -187,7 +188,8 @@
"15.0",
"15.2",
"15.3",
"15.4"
"15.4",
"15.5"
]
},
"fedora": {
4 changes: 2 additions & 2 deletions systems.json
Original file line number Diff line number Diff line change
@@ -27,12 +27,12 @@
{
"os": "linux",
"distribution": "opensuse",
"versions": [ "42.3", "15.0", "15.2", "15.3", "15.4" ]
"versions": [ "42.3", "15.0", "15.2", "15.3", "15.4", "15.5" ]
},
{
"os": "linux",
"distribution": "sle",
"versions": [ "12.3", "15.0", "15.2", "15.3", "15.4" ]
"versions": [ "12.3", "15.0", "15.2", "15.3", "15.4", "15.5" ]
},
{
"os": "linux",
4 changes: 4 additions & 0 deletions test/test-packages.sh
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@ declare -A os_identifiers=(
[rhel8]='redhat'
[rhel9]='redhat'
[opensuse154]='opensuse'
[opensuse155]='opensuse'
[sle154]='sle'
[sle155]='sle'
[fedora36]='fedora'
[fedora37]='fedora'
[fedora38]='fedora'
@@ -43,7 +45,9 @@ declare -A versions=(
[rhel8]='8'
[rhel9]='9'
[opensuse154]='15.4'
[opensuse155]='15.5'
[sle154]='15.4'
[sle155]='15.5'
[fedora36]='36'
[fedora37]='37'
[fedora38]='38'

0 comments on commit 502e3da

Please sign in to comment.