Skip to content

Commit

Permalink
Add Ubuntu-24.04 noble
Browse files Browse the repository at this point in the history
  • Loading branch information
grooverdan authored and fauust committed Feb 8, 2024
1 parent b2a4a68 commit 4e73c5e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/bbw_build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ jobs:
image: ubuntu:23.10
branch: 10.11
platforms: linux/amd64, linux/arm64/v8
- dockerfile: debian.Dockerfile
image: ubuntu:24.04
branch: 10.11
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
- dockerfile: fedora.Dockerfile
image: fedora:38
platforms: linux/amd64, linux/arm64/v8
Expand Down
5 changes: 3 additions & 2 deletions ci_build_images/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ RUN . /etc/os-release; \
&& if [ "${VERSION_ID}" = "20.04" ]; then apt-get -y install --no-install-recommends g++-10; fi \
&& if [ "$(arch)" = "x86_64" ]; then ARCH="amd64"; else ARCH=$(arch); fi \
&& curl -s "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" >/etc/apt/sources.list.d/galera-4.sources \
# VERSION_ID=13 once released \
&& if [ "${VERSION_CODENAME}" = trixie ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \
# trixie VERSION_ID=13 once released \
# 24.04 noble - until galera build happens based on this image, then rebuild so galera tests can occur
&& if [ "${VERSION_ID}" = 24.04 ] || [ "${VERSION_CODENAME}" = trixie ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \
&& apt-get update \
&& curl -skO https://raw.githubusercontent.com/MariaDB/server/44e4b93316be8df130c6d87880da3500d83dbe10/debian/control \
&& mkdir debian \
Expand Down
7 changes: 7 additions & 0 deletions os_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,10 @@ ubuntu-2310:
- aarch64
type: deb
has_install: False
ubuntu-2404:
version_name: noble
arch:
- amd64
- aarch64
- ppc64le
- s390x

0 comments on commit 4e73c5e

Please sign in to comment.