Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-debian-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ jobs:

- image: debian:sid
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
branch: 11.4
branch: 11.8
nogalera: false
deploy_on_schedule: true

- image: debian:sid
platforms: linux/386
branch: 11.4
branch: 11.8
tag: debiansid-386
nogalera: false
deploy_on_schedule: true
Expand Down Expand Up @@ -102,13 +102,13 @@ jobs:
- image: ubuntu:26.04
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
branch: 11.8
nogalera: true
nogalera: false

- image: ubuntu:26.04
tag: ubuntu26.04-amd64v3
platforms: linux/amd64
branch: 11.8
nogalera: true
nogalera: false
arch_variant: amd64v3

uses: ./.github/workflows/bbw_build_container_template.yml
Expand Down
10 changes: 6 additions & 4 deletions ci_build_images/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ RUN . /etc/os-release \
&& curl -skO "https://raw.githubusercontent.com/MariaDB/server/$MARIADB_BRANCH/debian/autobake-deb.sh" \
&& chmod a+x autobake-deb.sh \
&& AUTOBAKE_PREP_CONTROL_RULES_ONLY=1 ./autobake-deb.sh \
# Hack to force install ARM boost deps on older Debian/Ubuntu,
# needed for building and packaging ARM CS 23.10.x for MariaDB Server >= 11.4
&& sed -Ei '/libboost-/ s/\[amd64\]/[amd64 arm64]/g' debian/control \
# --
&& mk-build-deps -r -i debian/control \
-t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' \
&& apt-get -y build-dep -q mariadb-server \
Expand All @@ -69,12 +73,10 @@ RUN . /etc/os-release \
iproute2 \
iputils-ping \
libasio-dev \
# bootstrapping libboost additions in below line for MDEV-35826. \
# to be removed after https://github.com/MariaDB/server/pull/2651 merge to 11.4 \
libboost-atomic-dev libboost-chrono-dev libboost-date-time-dev libboost-regex-dev libboost-system-dev libboost-thread-dev \
libboost-dev \
# Required by galera-4 builds on all architectures
libboost-filesystem-dev \
libboost-program-options-dev \
#--
libbz2-dev \
libdbi-perl \
libeigen3-dev \
Expand Down