Add Alpine 3.20, remove Alpine 3.16

3.20 was released 2024-05-22 3.16 was EOL 2024-05-23
rstudio · Sep 10, 2024 · 892a9cc · 892a9cc
1 parent de481ac
commit 892a9cc
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE ?= rstudio/r-system-requirements
-VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 opensuse156 fedora38 fedora39 fedora40 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 opensuse156 fedora38 fedora39 fedora40 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge
 
 RULES ?= rules/*.json
 

diff --git a/docker/alpine-3.16/Dockerfile → docker/alpine-3.20/Dockerfile b/docker/alpine-3.16/Dockerfile → docker/alpine-3.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.20
 
 RUN apk update && \
     apk add curl bash

diff --git a/rules/atk.json b/rules/atk.json
@@ -81,7 +81,7 @@
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": [ "3.17", "3.18", "3.19", "edge" ]
+          "versions": [ "3.17", "3.18", "3.19", "3.20", "edge" ]
         }
       ]
     }

diff --git a/rules/blender.json b/rules/blender.json
@@ -43,7 +43,7 @@
           {
             "os": "linux",
             "distribution": "alpine",
-            "versions": [ "3.16", "3.17", "3.18", "3.19", "edge" ]
+            "versions": [ "3.16", "3.17", "3.18", "3.19", "3.20", "edge" ]
           }
         ]
       }

diff --git a/rules/opencl.json b/rules/opencl.json
@@ -111,7 +111,7 @@
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": [ "3.16", "3.17", "3.18", "3.19", "edge" ]
+          "versions": [ "3.16", "3.17", "3.18", "3.19", "3.20", "edge" ]
         }
       ]
     }

diff --git a/rules/protobuf-grpc.json b/rules/protobuf-grpc.json
@@ -70,7 +70,7 @@
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": ["3.17", "3.18", "3.19", "edge"]
+          "versions": ["3.17", "3.18", "3.19", "3.20", "edge"]
         }
       ]
     },

diff --git a/schema.json b/schema.json
@@ -211,6 +211,7 @@
           "3.17",
           "3.18",
           "3.19",
+          "3.20",
           "edge"
         ]
       },

diff --git a/systems.json b/systems.json
@@ -42,7 +42,7 @@
     {
         "os": "linux",
         "distribution": "alpine",
-        "versions": [ "3.15", "3.16", "3.17", "3.18", "3.19", "edge" ]
+        "versions": [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "edge" ]
     },
     {
         "os": "windows"

diff --git a/test/test-packages.sh b/test/test-packages.sh
@@ -25,10 +25,10 @@ declare -A os_identifiers=(
     [fedora38]='fedora'
     [fedora39]='fedora'
     [fedora40]='fedora'
-    [alpine-3.16]='alpine'
     [alpine-3.17]='alpine'
     [alpine-3.18]='alpine'
     [alpine-3.19]='alpine'
+    [alpine-3.20]='alpine'
     [alpine-edge]='alpine'
 )
 
@@ -53,10 +53,10 @@ declare -A versions=(
     [fedora38]='38'
     [fedora39]='39'
     [fedora40]='40'
-    [alpine-3.16]='3.16'
     [alpine-3.17]='3.17'
     [alpine-3.18]='3.18'
     [alpine-3.19]='3.19'
+    [alpine-3.20]='3.20'
     [alpine-edge]='edge'
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -211,6 +211,7 @@ @@
               "3.17",
               "3.18",
               "3.19",
+              "3.20",
               "edge"
             ]
           },
@@ Expand Down @@