Skip to content
Closed
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
6 changes: 5 additions & 1 deletion .github/workflows/bbw_build_container_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ on:
install_valgrind:
required: false
type: string
arch_variant:
required: false
type: string
files:
required: false
type: string
Expand Down Expand Up @@ -142,7 +145,8 @@ jobs:
--build-arg BASE_IMAGE=${{ inputs.image }} \
--build-arg CLANG_VERSION=${{ inputs.clang_version }} \
--build-arg MARIADB_BRANCH=${{ inputs.branch }} \
--build-arg INSTALL_VALGRIND="${{ inputs.install_valgrind }}"
--build-arg INSTALL_VALGRIND="${{ inputs.install_valgrind }}" \
--build-arg ARCH_VARIANT="${{ inputs.arch_variant }}"
done
podman images

Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/build-debian-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,18 @@ jobs:
branch: 11.8
nogalera: false

- image: ubuntu:26.04
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
branch: 11.8
nogalera: true

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

uses: ./.github/workflows/bbw_build_container_template.yml
with:
dockerfile: ${{ matrix.dockerfile || 'debian.Dockerfile' }}
Expand All @@ -107,6 +119,8 @@ jobs:
tag: ${{ matrix.tag }}
branch: ${{ matrix.branch }}
nogalera: ${{ matrix.nogalera }}
arch_variant: ${{ matrix.arch_variant }}
is_scheduled_event: ${{ inputs.is_scheduled_event || false }}
deploy_on_schedule: ${{ matrix.deploy_on_schedule || false }}
runner: 'ubuntu-24.04'
secrets: inherit
12 changes: 8 additions & 4 deletions ci_build_images/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ RUN . /etc/os-release \
exit 1; \
fi

ARG ARCH_VARIANT=
ENV ARCH_VARIANT=$ARCH_VARIANT
# Install updates and required packages
# see: https://cryptography.io/en/latest/installation/
RUN . /etc/os-release \
&& if [ -n "$ARCH_VARIANT" ]; then \
echo "APT::Architecture-Variants \"$ARCH_VARIANT\";" > /etc/apt/apt.conf.d/99enable-$ARCH_VARIANT; \
fi \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get -y install --no-install-recommends \
Expand Down Expand Up @@ -93,11 +98,10 @@ RUN . /etc/os-release \
&& if [ "${VERSION_ID}" != 18.04 ]; then \
apt-get -y install --no-install-recommends flex; \
fi \
&& if [ "${VERSION_ID}" = 22.04 ]; then \
apt-get -y install --no-install-recommends clang-14 libpcre3-dev llvm; \
elif [ "${VERSION_ID}" = 24.04 ]; then \
&& if [ "${VERSION_ID}" = 24.04 ] && [ "$(arch)" = "x86_64" ]; then \
# https://packages.ubuntu.com/noble/libclang-rt-18-dev, provider of asan, needs 32bit deps for amd64 \
if [ "$(arch)" = "x86_64" ]; then dpkg --add-architecture i386 && apt-get update; fi \
dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get -y install --no-install-recommends clang llvm-dev libclang-rt-18-dev; \
fi \
&& apt-get clean
Expand Down
7 changes: 6 additions & 1 deletion constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,11 @@
"amd64-ubuntu-2510",
"aarch64-fedora-43",
"amd64-fedora-43",
"aarch64-ubuntu-2604",
"amd64-ubuntu-2604",
"amd64v3-ubuntu-2604-deb-autobake-migration",
"ppc64le-ubuntu-2604",
"s390x-ubuntu-2604",
]
SUPPORTED_PLATFORMS["12.0"] = SUPPORTED_PLATFORMS["11.8"].copy()
SUPPORTED_PLATFORMS["12.1"] = SUPPORTED_PLATFORMS["12.0"].copy()
Expand Down Expand Up @@ -297,7 +302,7 @@
ALL_PLATFORMS.add(arch)
BUILDERS_AUTOBAKE.append(builder_name_autobake)
# No VM install for opensuse16.0.0 yet
if os_i == "opensuse-1600":
if os_i in ["opensuse-1600", "ubuntu-2604"]:
continue
# Currently there are no VMs for x86 and s390x
if arch not in ["s390x", "x86"]:
Expand Down
5 changes: 5 additions & 0 deletions master-migration/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ c["builders"] = [
image="debian12",
worker_pool=DEFAULT_AMD64_WORKER_POOL,
),
deb_release_builder(
name="amd64v3-ubuntu-2604-deb-autobake-migration",
image="ubuntu2604-amd64v3",
worker_pool=DEFAULT_AMD64_WORKER_POOL,
),
]

## ------------------------------------------------------------------- ##
Expand Down
2 changes: 1 addition & 1 deletion master-web/templates/home.jade
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
li
| Debian 11, 12, 13 and Sid
li
| Ubuntu 22.04, 24.04, 25.04 and 25.10
| Ubuntu 22.04, 24.04, 25.04, 25.10 and 26.04
li
| Fedora 41 and 42
li
Expand Down
10 changes: 10 additions & 0 deletions os_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,13 @@ ubuntu-2510:
- amd64
- aarch64
type: deb
ubuntu-2604:
image_tag: ubuntu26.04
tags:
- release_packages
arch:
- amd64
- aarch64
- ppc64le
- s390x
type: deb
Loading