Skip to content

Commit b9d2020

Browse files
committed
Adding Debian 13
1 parent e8ac8f1 commit b9d2020

File tree

7 files changed

+29
-14
lines changed

7 files changed

+29
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
compiler:
2121
- GNU
2222
image:
23-
- "debian:11"
2423
- "debian:12"
24+
- "debian:13"
2525
- "fedora:41"
2626
- "fedora:42"
2727
- "opensuse/leap:15"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
service-name:
3434
- archlinux
3535
- centos-stream-9
36-
- debian-11
3736
- debian-12
37+
- debian-13
3838
- fedora-41
3939
- fedora-42
4040
- opensuse-leap-15

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
strategy:
1818
matrix:
1919
image:
20-
- "debian:11"
2120
- "debian:12"
21+
- "debian:13"
2222
- "ubuntu:22.04"
2323
- "ubuntu:24.04"
2424
include:

docker/debian/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# hadolint global ignore=DL3008,DL3025,DL3059
22
# Arguments
3-
ARG debian_version=12
4-
ARG libiniparser_version=1
5-
ARG libmapnik_version=3.1
3+
ARG debian_version=13
4+
ARG libiniparser_version=4
5+
ARG libmapnik_version=4.0
66
ARG runner_additional_packages=libcurl4 libglib2.0
77

88
# Base

docker/debian/Dockerfile.autotools

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# hadolint global ignore=DL3008,DL3025,DL3059
22
# Arguments
3-
ARG debian_version=12
4-
ARG libiniparser_version=1
5-
ARG libmapnik_version=3.1
3+
ARG debian_version=13
4+
ARG libiniparser_version=4
5+
ARG libmapnik_version=4.0
66
ARG runner_additional_packages=libcurl4 libglib2.0
77

88
# Base

docker/docker-compose.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,15 @@ services:
8989
build:
9090
<<: *build_defaults_debian
9191
args:
92+
libiniparser_version: "1"
9293
libmapnik_version: "3.0"
9394
debian_version: "10"
9495
debian-10-autotools:
9596
<<: *service_defaults
9697
build:
9798
<<: *build_defaults_debian
9899
args:
100+
libiniparser_version: "1"
99101
libmapnik_version: "3.0"
100102
debian_version: "10"
101103
dockerfile: docker/debian/Dockerfile.autotools
@@ -104,13 +106,15 @@ services:
104106
build:
105107
<<: *build_defaults_debian
106108
args:
109+
libiniparser_version: "1"
107110
libmapnik_version: "3.1"
108111
debian_version: "11"
109112
debian-11-autotools:
110113
<<: *service_defaults
111114
build:
112115
<<: *build_defaults_debian
113116
args:
117+
libiniparser_version: "1"
114118
libmapnik_version: "3.1"
115119
debian_version: "11"
116120
dockerfile: docker/debian/Dockerfile.autotools
@@ -119,23 +123,36 @@ services:
119123
build:
120124
<<: *build_defaults_debian
121125
args:
126+
libiniparser_version: "1"
122127
libmapnik_version: "3.1"
123128
debian_version: "12"
124129
debian-12-autotools:
125130
<<: *service_defaults
126131
build:
127132
<<: *build_defaults_debian
128133
args:
134+
libiniparser_version: "1"
129135
libmapnik_version: "3.1"
130136
debian_version: "12"
131137
dockerfile: docker/debian/Dockerfile.autotools
138+
debian-13:
139+
<<: *service_defaults
140+
build:
141+
<<: *build_defaults_debian
142+
args:
143+
debian_version: "13"
144+
debian-13-autotools:
145+
<<: *service_defaults
146+
build:
147+
<<: *build_defaults_debian
148+
args:
149+
debian_version: "13"
150+
dockerfile: docker/debian/Dockerfile.autotools
132151
debian-unstable:
133152
<<: *service_defaults
134153
build:
135154
<<: *build_defaults_debian
136155
args:
137-
libiniparser_version: 4
138-
libmapnik_version: "4.0"
139156
debian_version: unstable
140157
runner_additional_packages: >-
141158
libcurl4t64
@@ -145,8 +162,6 @@ services:
145162
build:
146163
<<: *build_defaults_debian
147164
args:
148-
libiniparser_version: 4
149-
libmapnik_version: "4.0"
150165
debian_version: unstable
151166
runner_additional_packages: >-
152167
libcurl4t64

docs/build/building_on_debian.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please see our [Continuous Integration script](/.github/workflows/build-and-test
66

77
A Docker-based building & testing setup pipeline is also available [here](/docker) for your convenience.
88

9-
## Debian 10/11/12
9+
## Debian 10/11/12/13
1010

1111
```shell
1212
#!/usr/bin/env bash

0 commit comments

Comments
 (0)