From 7deef6c67f18da4681fa35c3d79802f4a92fb1f8 Mon Sep 17 00:00:00 2001
From: Guillaume Quintard <guillaume.quintard@varnish-software.com>
Date: Wed, 15 Oct 2025 14:24:34 -0700
Subject: [PATCH 1/3] [ci] update target distributions

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4aa420d3f5..36d9342f46 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -433,12 +433,13 @@ workflows:
           matrix:
             parameters:
               platform:
-                - ubuntu:focal
                 - ubuntu:jammy
                 - ubuntu:noble
                 - debian:bookworm
+                - debian:trixie
                 - almalinux:8
                 - almalinux:9
+                - almalinux:10
                 - fedora:latest
                 - alpine:latest
               rclass:

From b9113c168384cb745563fe5c0798687cf77ab4e4 Mon Sep 17 00:00:00 2001
From: Guillaume Quintard <guillaume.quintard@varnish-software.com>
Date: Wed, 15 Oct 2025 14:45:51 -0700
Subject: [PATCH 2/3] [ci] build-pkgs is a boolean

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 36d9342f46..9d4f570094 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,8 +23,8 @@ parameters:
         --disable-stack-protector \
         --with-persistent-storage \
   build-pkgs:
-    type: string
-    default: ""
+    type: boolean
+    default: false
 
 jobs:
   dist:

From f6979321f756e672bf36b53813669ab1fd9ff0f1 Mon Sep 17 00:00:00 2001
From: Guillaume Quintard <guillaume.quintard@varnish-software.com>
Date: Thu, 16 Oct 2025 18:45:28 -0700
Subject: [PATCH 3/3] [cci] also install epel for almalinux:10

---
 .circleci/config.yml           | 8 ++++----
 .circleci/make-rpm-packages.sh | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d4f570094..33fc02d5ad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,16 +231,16 @@ jobs:
             case "<< parameters.dist >>" in
             almalinux|fedora)
                 case "<< parameters.dist >>:<< parameters.release >>" in
-                    almalinux:9)
+                    almalinux:8)
                         dnf -y install "dnf-command(config-manager)"
-                        dnf config-manager --set-enabled crb
+                        dnf config-manager --set-enabled powertools
                         dnf -y install diffutils
                         dnf -y install epel-release
                         dnf -y groupinstall "Development Tools"
                         ;;
-                    almalinux:8)
+                    almalinux:*)
                         dnf -y install "dnf-command(config-manager)"
-                        dnf config-manager --set-enabled powertools
+                        dnf config-manager --set-enabled crb
                         dnf -y install diffutils
                         dnf -y install epel-release
                         dnf -y groupinstall "Development Tools"
diff --git a/.circleci/make-rpm-packages.sh b/.circleci/make-rpm-packages.sh
index 4a9f8a1423..61d0914e51 100755
--- a/.circleci/make-rpm-packages.sh
+++ b/.circleci/make-rpm-packages.sh
@@ -14,14 +14,14 @@ elif [ -z "$PARAM_DIST" ]; then
 fi
 
 case "$PARAM_DIST:$PARAM_RELEASE" in
-    almalinux:9)
+    almalinux:8)
         dnf -y install 'dnf-command(config-manager)'
-        dnf config-manager --set-enabled crb
+        dnf config-manager --set-enabled powertools
         dnf -y install epel-release
         ;;
-    almalinux:8)
+    almalinux:*)
         dnf -y install 'dnf-command(config-manager)'
-        dnf config-manager --set-enabled powertools
+        dnf config-manager --set-enabled crb
         dnf -y install epel-release
         ;;
 esac