Merge pull request #153 from rstudio/suse155

Deprecate Ubuntu 18.04 and SUSE 15.3; add SUSE 15.5

Makefile

@@ -1,5 +1,5 @@
 IMAGE ?= rstudio/r-system-requirements
-VARIANTS ?= bionic focal jammy buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse153 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
 

README.md

@@ -87,12 +87,12 @@ Both tests run with R 3.5.3 for all CRAN packages as of April 4, 2019.
 
 The rules in this catalog support the following operating systems:
 
-- Ubuntu 18.04, 20.04, 22.04
+- Ubuntu 20.04, 22.04
 - CentOS 7
 - Rocky Linux 8*, 9
 - Red Hat Enterprise Linux 7, 8, 9
-- openSUSE 15.3, 15.4
-- SUSE Linux Enterprise 15 SP3, 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)
@@ -283,7 +283,6 @@ make update-sysreqs
 packages on supported OSs.
 
 Available tags:
-- `bionic` (Ubuntu 18.04)
 - `focal` (Ubuntu 20.04)
 - `jammy` (Ubuntu 22.04)
 - `buster` (Debian 10)
@@ -293,8 +292,8 @@ Available tags:
 - `centos7` (CentOS 7)
 - `centos8` (Rocky Linux 8)
 - `rockylinux9` (Rocky Linux 9)
-- `opensuse153` (openSUSE 15.3)
 - `opensuse154` (openSUSE 15.4)
+- `opensuse155` (openSUSE 15.5)
 - `fedora36` (Fedora 36)
 - `fedora37` (Fedora 37)
 - `fedora38` (Fedora 38)

docker/opensuse153/Dockerfile → docker/opensuse155/Dockerfile

@@ -1,8 +1,8 @@
-FROM opensuse/leap:15.3
+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.6/jq-linux64 && \
+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

rules/java.json

@@ -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"]
         }
       ]
     },

rules/libgit2.json

@@ -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"]
         }
       ]
     },

rules/libicu.json

@@ -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"]
         }
       ]
     },

rules/libmysqlclient.json

@@ -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"]
         }
       ]
     },

rules/proj.json

@@ -131,7 +131,7 @@
         {
           "os": "linux",
           "distribution": "opensuse",
-          "versions": ["15.2", "15.3", "15.4"]
+          "versions": ["15.2", "15.3", "15.4", "15.5"]
         }
       ]
     },

schema.json

@@ -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": {

systems.json

@@ -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",

test/test-packages.sh

@@ -5,7 +5,6 @@ set -euo pipefail
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 declare -A os_identifiers=(
-    [bionic]='ubuntu'
     [focal]='ubuntu'
     [jammy]='ubuntu'
     [buster]='debian'
@@ -18,10 +17,10 @@ declare -A os_identifiers=(
     [rhel7]='redhat'
     [rhel8]='redhat'
     [rhel9]='redhat'
-    [opensuse153]='opensuse'
     [opensuse154]='opensuse'
-    [sle153]='sle'
+    [opensuse155]='opensuse'
     [sle154]='sle'
+    [sle155]='sle'
     [fedora36]='fedora'
     [fedora37]='fedora'
     [fedora38]='fedora'
@@ -33,7 +32,6 @@ declare -A os_identifiers=(
 )
 
 declare -A versions=(
-    [bionic]='18.04'
     [focal]='20.04'
     [jammy]='22.04'
     [buster]='10'
@@ -46,10 +44,10 @@ declare -A versions=(
     [rhel7]='7'
     [rhel8]='8'
     [rhel9]='9'
-    [opensuse153]='15.3'
     [opensuse154]='15.4'
-    [sle153]='15.3'
+    [opensuse155]='15.5'
     [sle154]='15.4'
+    [sle155]='15.5'
     [fedora36]='36'
     [fedora37]='37'
     [fedora38]='38'