From: Michal Nowak <mnowak@isc.org>
Date: Wed, 1 Oct 2025 09:00:36 +0000 (+0200)
Subject: Make Debian 13 "trixie" the base image
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f38b03d6f0bbab27ccc9b6d043840d5a6d823c;p=thirdparty%2Fbind9.git

Make Debian 13 "trixie" the base image

Bump CLANG to clang-20 that is in "trixie".
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20f40be7ce3..fb6d0a1dc71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
   TEST_PARALLEL_JOBS: 4
 
   CONFIGURE: ./configure
-  CLANG: clang-19
+  CLANG: clang-20
   ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-19/bin/llvm-symbolizer
 
   CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra
@@ -103,8 +103,8 @@ stages:
   image: "$CI_REGISTRY_IMAGE:debian-buster-amd64"
   <<: *linux_amd64
 
-.debian-bookworm-amd64: &debian_bookworm_amd64_image
-  image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
+.debian-trixie-amd64: &debian_trixie_amd64_image
+  image: "$CI_REGISTRY_IMAGE:debian-trixie-amd64"
   <<: *linux_amd64
 
 # Ubuntu
@@ -117,7 +117,7 @@ stages:
 # This is a meta image that is used as a base for non-specific jobs
 
 .base: &base_image
-  <<: *debian_bookworm_amd64_image
+  <<: *debian_trixie_amd64_image
 
 ### Job Templates
 
@@ -342,11 +342,11 @@ tarball-create:
     paths:
       - bind-*.tar.${TARBALL_EXTENSION}
 
-# Jobs for doc builds on Debian 11 "bookworm" (amd64)
+# Jobs for doc builds on Debian 13 "trixie" (amd64)
 
 docs:
   <<: *release_branch_triggering_rules
-  <<: *debian_bookworm_amd64_image
+  <<: *base_image
   stage: docs
   script:
     - ./configure || cat config.log
@@ -523,7 +523,7 @@ unit:gcc:buster:amd64:
     - job: gcc:buster:amd64
       artifacts: true
 
-# Jobs for tarball GCC builds on Debian 11 "bookworm" (amd64)
+# Jobs for tarball GCC builds on Debian 13 "trixie" (amd64)
 
 gcc:tarball:
   variables:
@@ -781,7 +781,7 @@ coverity:
 # Respdiff tests
 
 respdiff:
-  <<: *debian_bookworm_amd64_image
+  <<: *base_image
   <<: *schedules_tags_web_triggering_rules
   stage: system
   variables:
@@ -807,7 +807,7 @@ respdiff:
     when: always
 
 respdiff-third-party:
-  <<: *debian_bookworm_amd64_image
+  <<: *base_image
   <<: *schedules_tags_web_triggering_rules
   stage: system
   variables: