Adding Debian 13 to CI (#488)

Author: hummeltech

.github/workflows/build-and-test.yml

@@ -20,12 +20,11 @@ jobs:
         compiler:
           - GNU
         image:
-          - "debian:11"
           - "debian:12"
+          - "debian:13"
           - "fedora:41"
           - "fedora:42"
           - "opensuse/leap:15"
-          - "quay.io/centos/centos:stream9"
           - "ubuntu:22.04"
         on_default_branch:
           - ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') || contains(github.ref, 'CI') }}
@@ -34,6 +33,14 @@ jobs:
             build_system: CMake
             compiler: GNU
             experimental: true
+          - image: "quay.io/centos/centos:stream9"
+            build_system: CMake
+            compiler: GNU
+            experimental: true
+          - image: "quay.io/centos/centos:stream10"
+            build_system: CMake
+            compiler: GNU
+            experimental: true
           - image: "fedora:rawhide"
             build_system: CMake
             compiler: GNU
@@ -85,6 +92,7 @@ jobs:
         uses: ./.github/actions/coverage
         with:
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
+          lcov-extra-options: ${{ matrix.image == 'debian:13' && '--ignore-errors inconsistent' || '' }}
         if: |
           matrix.compiler != 'LLVM' &&
           !startsWith(matrix.image, 'opensuse/') &&

.github/workflows/docker-image-build.yml

@@ -32,15 +32,18 @@ jobs:
       matrix:
         service-name:
           - archlinux
-          - centos-stream-9
-          - debian-11
           - debian-12
+          - debian-13
           - fedora-41
           - fedora-42
           - opensuse-leap-15
           - ubuntu-22.04
           - ubuntu-24.04
         include:
+          - service-name: centos-stream-9
+            experimental: true
+          - service-name: centos-stream-10
+            experimental: true
           - service-name: debian-unstable
             experimental: true
           - service-name: debian-unstable-autotools

.github/workflows/install-package-and-test.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         image:
-          - "debian:11"
           - "debian:12"
+          - "debian:13"
           - "ubuntu:22.04"
           - "ubuntu:24.04"
         include:

docker/debian/Dockerfile

@@ -1,8 +1,8 @@
 # hadolint global ignore=DL3008,DL3025,DL3059
 # Arguments
-ARG debian_version=12
-ARG libiniparser_version=1
-ARG libmapnik_version=3.1
+ARG debian_version=13
+ARG libiniparser_version=4
+ARG libmapnik_version=4.0
 ARG runner_additional_packages=libcurl4 libglib2.0
 
 # Base

docker/debian/Dockerfile.autotools

@@ -1,8 +1,8 @@
 # hadolint global ignore=DL3008,DL3025,DL3059
 # Arguments
-ARG debian_version=12
-ARG libiniparser_version=1
-ARG libmapnik_version=3.1
+ARG debian_version=13
+ARG libiniparser_version=4
+ARG libmapnik_version=4.0
 ARG runner_additional_packages=libcurl4 libglib2.0
 
 # Base

docker/docker-compose.yml

@@ -77,25 +77,27 @@ services:
         centos_stream_version: "9"
         extra_repository: crb
       dockerfile: docker/centos/stream/Dockerfile.mapnik-latest
-  centos-stream-10-development:
+  centos-stream-10:
     <<: *service_defaults
     build:
       <<: *build_defaults_centos_stream
       args:
-        centos_stream_version: "10-development"
+        centos_stream_version: "10"
         extra_repository: crb
   debian-10:
     <<: *service_defaults
     build:
       <<: *build_defaults_debian
       args:
+        libiniparser_version: "1"
         libmapnik_version: "3.0"
         debian_version: "10"
   debian-10-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_debian
       args:
+        libiniparser_version: "1"
         libmapnik_version: "3.0"
         debian_version: "10"
       dockerfile: docker/debian/Dockerfile.autotools
@@ -104,13 +106,15 @@ services:
     build:
       <<: *build_defaults_debian
       args:
+        libiniparser_version: "1"
         libmapnik_version: "3.1"
         debian_version: "11"
   debian-11-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_debian
       args:
+        libiniparser_version: "1"
         libmapnik_version: "3.1"
         debian_version: "11"
       dockerfile: docker/debian/Dockerfile.autotools
@@ -119,24 +123,38 @@ services:
     build:
       <<: *build_defaults_debian
       args:
+        libiniparser_version: "1"
         libmapnik_version: "3.1"
         debian_version: "12"
   debian-12-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_debian
       args:
+        libiniparser_version: "1"
         libmapnik_version: "3.1"
         debian_version: "12"
       dockerfile: docker/debian/Dockerfile.autotools
+  debian-13:
+    <<: *service_defaults
+    build:
+      <<: *build_defaults_debian
+      args:
+        debian_version: "13"
+  debian-13-autotools:
+    <<: *service_defaults
+    build:
+      <<: *build_defaults_debian
+      args:
+        debian_version: "13"
+      dockerfile: docker/debian/Dockerfile.autotools
   debian-unstable:
     <<: *service_defaults
     build:
       <<: *build_defaults_debian
       args:
-        libiniparser_version: 4
-        libmapnik_version: "4.0"
         debian_version: unstable
+        libmapnik_version: "4.1"
         runner_additional_packages: >-
           libcurl4t64
           libglib2.0-0t64
@@ -145,9 +163,8 @@ services:
     build:
       <<: *build_defaults_debian
       args:
-        libiniparser_version: 4
-        libmapnik_version: "4.0"
         debian_version: unstable
+        libmapnik_version: "4.1"
         runner_additional_packages: >-
           libcurl4t64
           libglib2.0-0t64
@@ -271,15 +288,15 @@ services:
       <<: *build_defaults_ubuntu
       args:
         libiniparser_version: 4
-        libmapnik_version: "4.0"
+        libmapnik_version: "4.1"
         ubuntu_version: "devel"
   ubuntu-devel-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_ubuntu
       args:
         libiniparser_version: 4
-        libmapnik_version: "4.0"
+        libmapnik_version: "4.1"
         ubuntu_version: "devel"
       dockerfile: docker/ubuntu/Dockerfile.autotools
   ubuntu-devel-full:
@@ -288,7 +305,7 @@ services:
       <<: *build_defaults_ubuntu
       args:
         libiniparser_version: 4
-        libmapnik_version: "4.0"
+        libmapnik_version: "4.1"
         runner_additional_packages: >-
           curl
           gdal-bin

docs/build/building_on_debian.md

@@ -6,7 +6,7 @@ Please see our [Continuous Integration script](/.github/workflows/build-and-test
 
 A Docker-based building & testing setup pipeline is also available [here](/docker) for your convenience.
 
-## Debian 10/11/12
+## Debian 10/11/12/13
 
 ```shell
 #!/usr/bin/env bash