Skip to content

Commit 0f76bc8

Browse files
MDEV-39015 - Revert Deb/Ubu debian/control base back to 10.11
MariaDB/server#4863 targeting 11.4, is removing the boost deps to support CS 6.4 so we can't base older Ubu/Deb on 11.4, because server versions 10.6/10.11 (CS 6.4) are still built there. Older Ubu/Deb build 11.4 + so ARM deps are still a requirement, resulting in a small hack to the downloaded debian/control file.
1 parent bf853f3 commit 0f76bc8

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/build-debian-based.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ jobs:
3838
include:
3939
- image: debian:11
4040
platforms: linux/amd64, linux/arm64/v8
41-
branch: 11.4
41+
branch: 10.11
4242
nogalera: false
4343

4444
- image: debian:12
4545
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
46-
branch: 11.4
46+
branch: 10.11
4747
tag: debian12
4848
nogalera: false
4949

5050
- image: debian:12
5151
platforms: linux/386
52-
branch: 11.4
52+
branch: 10.11
5353
tag: debian12-386
5454
nogalera: false
5555
dockerfile: 'debian.Dockerfile hashicorp.fragment.Dockerfile minio.fragment.Dockerfile'
@@ -81,12 +81,12 @@ jobs:
8181

8282
- image: ubuntu:22.04
8383
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
84-
branch: 11.4
84+
branch: 10.11
8585
nogalera: false
8686

8787
- image: ubuntu:24.04
8888
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
89-
branch: 11.4
89+
branch: 10.11
9090
nogalera: false
9191

9292
- image: ubuntu:25.04

ci_build_images/debian.Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ RUN . /etc/os-release \
5151
&& chmod a+x autobake-deb.sh \
5252
&& AUTOBAKE_PREP_CONTROL_RULES_ONLY=1 ./autobake-deb.sh \
5353
&& mk-build-deps -r -i debian/control \
54+
# Hack to force install ARM boost deps on older Debian/Ubuntu,
55+
# needed for building and packaging ARM CS 23.10.x for MariaDB Server >= 11.4
56+
&& sed -Ei '/libboost-/ s/\[amd64\]/[amd64 arm64]/g' debian/control \
57+
# --
5458
-t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' \
5559
&& apt-get -y build-dep -q mariadb-server \
5660
&& apt-get -y install --no-install-recommends \

0 commit comments

Comments
 (0)