From d23489d7d36c36a1a128cb57f2cb3da253e94029 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 9 Dec 2024 16:35:59 +0100
Subject: [PATCH] Add Alpine Linux 3.21

(cherry picked from commit 6340454ea74cf7ea839251cbf9cb4ee00016bad5)
---
 .gitlab-ci.yml            | 22 +++++++++++-----------
 doc/arm/platforms.inc.rst |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1d51b5ea8..bffd5048fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,8 +123,8 @@ stages:
 
 # Alpine Linux
 
-.alpine-3.20-amd64: &alpine_3_20_amd64_image
-  image: "$CI_REGISTRY_IMAGE:alpine-3.20-amd64"
+.alpine-3.21-amd64: &alpine_3_21_amd64_image
+  image: "$CI_REGISTRY_IMAGE:alpine-3.21-amd64"
   <<: *linux_amd64
 
 # Oracle Linux
@@ -764,28 +764,28 @@ cross-version-config-tests:
     expire_in: "1 day"
     when: always
 
-# Jobs for regular GCC builds on Alpine Linux 3.20 (amd64)
+# Jobs for regular GCC builds on Alpine Linux 3.21 (amd64)
 
-gcc:alpine3.20:amd64:
+gcc:alpine3.21:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "${WITHOUT_READLINE}"
-  <<: *alpine_3_20_amd64_image
+  <<: *alpine_3_21_amd64_image
   <<: *build_job
 
-system:gcc:alpine3.20:amd64:
-  <<: *alpine_3_20_amd64_image
+system:gcc:alpine3.21:amd64:
+  <<: *alpine_3_21_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:alpine3.20:amd64
+    - job: gcc:alpine3.21:amd64
       artifacts: true
 
-unit:gcc:alpine3.20:amd64:
-  <<: *alpine_3_20_amd64_image
+unit:gcc:alpine3.21:amd64:
+  <<: *alpine_3_21_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:alpine3.20:amd64
+    - job: gcc:alpine3.21:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Oracle Linux 8 (amd64)
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index a7287843ff..f54780fa38 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -50,7 +50,7 @@ following systems:
 -  Fedora 40
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9
 -  FreeBSD 13.4, 14.2
--  Alpine Linux 3.20
+-  Alpine Linux 3.21
 
 The amd64 CPU architecture is fully supported and regularly tested.