mirror of
https://github.com/openstreetmap/mod_tile.git
synced 2026-01-09 14:17:29 +00:00
Adding Debian 13 to CI (#488)
This commit is contained in:
12
.github/workflows/build-and-test.yml
vendored
12
.github/workflows/build-and-test.yml
vendored
@ -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/') &&
|
||||
|
||||
7
.github/workflows/docker-image-build.yml
vendored
7
.github/workflows/docker-image-build.yml
vendored
@ -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
|
||||
|
||||
@ -17,8 +17,8 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
image:
|
||||
- "debian:11"
|
||||
- "debian:12"
|
||||
- "debian:13"
|
||||
- "ubuntu:22.04"
|
||||
- "ubuntu:24.04"
|
||||
include:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -77,18 +77,19 @@ 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:
|
||||
@ -96,6 +97,7 @@ services:
|
||||
build:
|
||||
<<: *build_defaults_debian
|
||||
args:
|
||||
libiniparser_version: "1"
|
||||
libmapnik_version: "3.0"
|
||||
debian_version: "10"
|
||||
dockerfile: docker/debian/Dockerfile.autotools
|
||||
@ -104,6 +106,7 @@ services:
|
||||
build:
|
||||
<<: *build_defaults_debian
|
||||
args:
|
||||
libiniparser_version: "1"
|
||||
libmapnik_version: "3.1"
|
||||
debian_version: "11"
|
||||
debian-11-autotools:
|
||||
@ -111,6 +114,7 @@ services:
|
||||
build:
|
||||
<<: *build_defaults_debian
|
||||
args:
|
||||
libiniparser_version: "1"
|
||||
libmapnik_version: "3.1"
|
||||
debian_version: "11"
|
||||
dockerfile: docker/debian/Dockerfile.autotools
|
||||
@ -119,6 +123,7 @@ services:
|
||||
build:
|
||||
<<: *build_defaults_debian
|
||||
args:
|
||||
libiniparser_version: "1"
|
||||
libmapnik_version: "3.1"
|
||||
debian_version: "12"
|
||||
debian-12-autotools:
|
||||
@ -126,17 +131,30 @@ services:
|
||||
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,7 +288,7 @@ services:
|
||||
<<: *build_defaults_ubuntu
|
||||
args:
|
||||
libiniparser_version: 4
|
||||
libmapnik_version: "4.0"
|
||||
libmapnik_version: "4.1"
|
||||
ubuntu_version: "devel"
|
||||
ubuntu-devel-autotools:
|
||||
<<: *service_defaults
|
||||
@ -279,7 +296,7 @@ services:
|
||||
<<: *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
|
||||
|
||||
2
docs/build/building_on_debian.md
vendored
2
docs/build/building_on_debian.md
vendored
@ -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
|
||||
|
||||
Reference in New Issue
Block a user