Add Alpine Linux 3.18

(cherry picked from commit ddb846454dc9c8d1ef4f4d22bda23e82bbbfbe02)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 893e5f153fbac49a58a2d56124e74eb485854972..1d8978e63471eedfa705941ab3157a936ad61039 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,8 +126,8 @@ stages:
 
 # Alpine Linux
 
-.alpine-3.17-amd64: &alpine_3_17_amd64_image
-  image: "$CI_REGISTRY_IMAGE:alpine-3.17-amd64"
+.alpine-3.18-amd64: &alpine_3_18_amd64_image
+  image: "$CI_REGISTRY_IMAGE:alpine-3.18-amd64"
   <<: *linux_amd64
 
 # Oracle Linux
@@ -622,28 +622,28 @@ docs:tarball:
     - job: tarball-create
       artifacts: true
 
-# Jobs for regular GCC builds on Alpine Linux 3.17 (amd64)
+# Jobs for regular GCC builds on Alpine Linux 3.18 (amd64)
 
-gcc:alpine3.17:amd64:
+gcc:alpine3.18:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "${WITHOUT_READLINE}"
-  <<: *alpine_3_17_amd64_image
+  <<: *alpine_3_18_amd64_image
   <<: *build_job
 
-system:gcc:alpine3.17:amd64:
-  <<: *alpine_3_17_amd64_image
+system:gcc:alpine3.18:amd64:
+  <<: *alpine_3_18_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:alpine3.17:amd64
+    - job: gcc:alpine3.18:amd64
       artifacts: true
 
-unit:gcc:alpine3.17:amd64:
-  <<: *alpine_3_17_amd64_image
+unit:gcc:alpine3.18:amd64:
+  <<: *alpine_3_18_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:alpine3.17:amd64
+    - job: gcc:alpine3.18:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Oracle Linux 7 (amd64)

diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index dc12ca2cfd9045a2fff69985788cb3e10cb6b74e..0d6c405ac57e8d1c06e2643fc2685381b1653910 100644 (file)
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -51,7 +51,7 @@ following systems:
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.4, 13.2
 -  OpenBSD 7.3
--  Alpine Linux 3.17
+-  Alpine Linux 3.18
 
 The amd64, i386, armhf, and arm64 CPU architectures are all fully
 supported.