Skip to content

Commit ee26e1f

Browse files
MDBF-1156: Build comntainer envs for Ubuntu 26.04
Use ARCH_VARIANT to configure amd64v3 repos. The removal of clang-14 / llvm install has to do with the already (2 years) deprecated builder `amd64-ubuntu-2204-clang14-asan`
1 parent 8e5006d commit ee26e1f

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,18 @@ jobs:
9999
branch: 11.8
100100
nogalera: false
101101

102+
- image: ubuntu:26.04
103+
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
104+
branch: 11.8
105+
nogalera: true
106+
107+
- image: ubuntu:26.04
108+
tag: ubuntu26.04-amd64v3
109+
platforms: linux/amd64
110+
branch: 11.8
111+
nogalera: true
112+
arch_variant: amd64v3
113+
102114
uses: ./.github/workflows/bbw_build_container_template.yml
103115
with:
104116
dockerfile: ${{ matrix.dockerfile || 'debian.Dockerfile' }}
@@ -107,6 +119,8 @@ jobs:
107119
tag: ${{ matrix.tag }}
108120
branch: ${{ matrix.branch }}
109121
nogalera: ${{ matrix.nogalera }}
122+
arch_variant: ${{ matrix.arch_variant }}
110123
is_scheduled_event: ${{ inputs.is_scheduled_event || false }}
111124
deploy_on_schedule: ${{ matrix.deploy_on_schedule || false }}
125+
runner: 'ubuntu-24.04'
112126
secrets: inherit

ci_build_images/debian.Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ RUN . /etc/os-release \
2323
exit 1; \
2424
fi
2525

26+
ARG ARCH_VARIANT=
27+
ENV ARCH_VARIANT=$ARCH_VARIANT
2628
# Install updates and required packages
2729
# see: https://cryptography.io/en/latest/installation/
2830
RUN . /etc/os-release \
31+
&& if [ -n "$ARCH_VARIANT" ]; then \
32+
echo "APT::Architecture-Variants \"$ARCH_VARIANT\";" > /etc/apt/apt.conf.d/99enable-$ARCH_VARIANT; \
33+
fi \
2934
&& apt-get update \
3035
&& apt-get -y upgrade \
3136
&& apt-get -y install --no-install-recommends \
@@ -93,11 +98,10 @@ RUN . /etc/os-release \
9398
&& if [ "${VERSION_ID}" != 18.04 ]; then \
9499
apt-get -y install --no-install-recommends flex; \
95100
fi \
96-
&& if [ "${VERSION_ID}" = 22.04 ]; then \
97-
apt-get -y install --no-install-recommends clang-14 libpcre3-dev llvm; \
98-
elif [ "${VERSION_ID}" = 24.04 ]; then \
101+
&& if [ "${VERSION_ID}" = 24.04 ] && [ "$(arch)" = "x86_64" ]; then \
99102
# https://packages.ubuntu.com/noble/libclang-rt-18-dev, provider of asan, needs 32bit deps for amd64 \
100-
if [ "$(arch)" = "x86_64" ]; then dpkg --add-architecture i386 && apt-get update; fi \
103+
dpkg --add-architecture i386 \
104+
&& apt-get update \
101105
&& apt-get -y install --no-install-recommends clang llvm-dev libclang-rt-18-dev; \
102106
fi \
103107
&& apt-get clean

0 commit comments

Comments
 (0)