Add Debian "trixie"

(cherry picked from commit 263810e7792b66a33999b7f97602c0c1fa9b35b7)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0836bc3765c043f68f1cf66fdee8b858dcd47853..631b5055147762984eb441b888a01648256972cc 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,6 +190,10 @@ stages:
   image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
   <<: *linux_amd64
 
+.debian-trixie-amd64: &debian_trixie_amd64_image
+  image: "$CI_REGISTRY_IMAGE:debian-trixie-amd64"
+  <<: *linux_amd64
+
 .tsan-debian-bookworm-amd64: &tsan_debian_bookworm_amd64_image
   image: "$CI_REGISTRY_IMAGE:tsan-debian-bookworm-amd64"
   <<: *linux_amd64
@@ -995,6 +999,31 @@ unit:gcc:bookworm:amd64:
     - job: gcc:bookworm:amd64
       artifacts: true
 
+# Jobs for regular GCC builds on Debian 13 "trixie" (amd64)
+
+gcc:trixie:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-libidn2"
+    RUN_MAKE_INSTALL: 1
+  <<: *debian_trixie_amd64_image
+  <<: *build_job
+
+system:gcc:trixie:amd64:
+  <<: *debian_trixie_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: gcc:trixie:amd64
+      artifacts: true
+
+unit:gcc:trixie:amd64:
+  <<: *debian_trixie_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:trixie:amd64
+      artifacts: true
+
 # Build job for cross-compiled GCC builds on 64-bit Debian 12 "bookworm"
 # (amd64) with 32-bit BIND 9.
 
@@ -1396,6 +1425,32 @@ unit:clang:bookworm:amd64:
     - job: clang:bookworm:amd64
       artifacts: true
 
+# Jobs for Clang builds on Debian 13 "trixie" (amd64)
+
+clang:trixie:amd64:
+  variables:
+    CC: ${CLANG}
+    CFLAGS: "${CFLAGS_COMMON}"
+    RUN_MAKE_INSTALL: 1
+  <<: *debian_trixie_amd64_image
+  <<: *build_job
+
+system:clang:trixie:amd64:
+  <<: *debian_trixie_amd64_image
+  <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
+  needs:
+    - job: clang:trixie:amd64
+      artifacts: true
+
+unit:clang:trixie:amd64:
+  <<: *debian_trixie_amd64_image
+  <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
+  needs:
+    - job: clang:trixie:amd64
+      artifacts: true
+
 # Jobs for Clang builds on FreeBSD 13 (amd64)
 
 clang:freebsd13:amd64:

diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index cf67ad00f7f8112f8dfa8d7424af4ac69a533203..ec343f3fb62853e5ab7bda25d003f3a46b692598 100644 (file)
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -45,7 +45,7 @@ Regularly Tested Platforms
 Current versions of BIND 9 are fully supported and regularly tested on the
 following systems:
 
--  Debian 12
+-  Debian 12, 13
 -  Ubuntu LTS 22.04, 24.04
 -  Fedora 42
 -  Red Hat Enterprise Linux / CentOS / AlmaLinux 8, 9, 10