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
5 changes: 0 additions & 5 deletions .github/workflows/build-debian-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ jobs:
tag: debiansid-386
nogalera: false

- image: ubuntu:20.04
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
branch: 10.11
nogalera: false

- image: ubuntu:22.04
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
branch: 10.11
Expand Down
3 changes: 1 addition & 2 deletions ci_build_images/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ RUN . /etc/os-release \
devscripts \
equivs \
lsb-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); echo /* galera-4 */; fi \
&& if curl --head --silent "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" | head -n1 | grep -q 200; then \
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; fi \
Expand Down Expand Up @@ -84,7 +83,7 @@ RUN . /etc/os-release \
sudo \
wget \
&& if [ "$(getconf LONG_BIT)" = 64 ]; then apt-get -y install --no-install-recommends galera-4; fi \
&& if [ "${VERSION_ID}" != 20.04 ] && [ "${VERSION_ID}" != 11 ]; then \
&& if [ "${VERSION_ID}" != 11 ]; then \
# Bootstrap MDEV-32686 so only temporary until https://github.com/MariaDB/server/pull/3692 merged up \
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends dh-package-notes; \
fi \
Expand Down
27 changes: 11 additions & 16 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,16 @@
"amd64-debian-11-debug-ps-embedded",
"amd64-msan-clang-20",
"amd64-fedora-41",
"amd64-ubuntu-2004-debug",
"amd64-ubuntu-2204-debug",
"amd64-ubuntu-2204-debug-ps",
"amd64-windows",
]

# Special builders triggering
BUILDERS_BIG = ["amd64-ubuntu-2004-bigtest"]
BUILDERS_BIG = ["amd64-ubuntu-2204-bigtest"]
BUILDERS_ECO = [
"amd64-debian-10-eco-mysqljs",
"amd64-debian-10-eco-pymysql",
"amd64-ubuntu-2004-eco-php",
]

if os.environ["ENVIRON"] == "DEV":
Expand All @@ -77,15 +76,15 @@

BUILDERS_GALERA_MTR = [
"aarch64-debian-12",
"s390x-ubuntu-2004",
"s390x-ubuntu-2204",
"ppc64le-ubuntu-2004",
"s390x-ubuntu-2204",
"ppc64le-ubuntu-2204",
"ppc64le-ubuntu-2204",
"amd64-freebsd-14",
]
BUILDERS_S3_MTR = [
"aarch64-ubuntu-2004-debug",
"amd64-ubuntu-2004-debug",
"aarch64-ubuntu-2204-debug",
"amd64-ubuntu-2204-debug",
"s390x-sles-1506",
]

Expand All @@ -112,9 +111,8 @@
"aarch64-openeuler-2403",
"aarch64-rhel-8",
"aarch64-rhel-9",
"aarch64-ubuntu-2004",
"aarch64-ubuntu-2004-debug",
"aarch64-ubuntu-2204",
"aarch64-ubuntu-2204-debug",
"amd64-centos-7-bintar",
"amd64-centos-stream9",
"amd64-compile-only-minimal",
Expand All @@ -134,10 +132,9 @@
"amd64-rhel-9",
"amd64-rhel-9-rpm-autobake-migration",
"amd64-last-N-failed",
"amd64-ubuntu-2004",
"amd64-ubuntu-2004-debug",
"amd64-ubuntu-2004-fulltest",
"amd64-ubuntu-2204",
"amd64-ubuntu-2204-debug",
"amd64-ubuntu-2204-fulltest",
"amd64-ubuntu-2204-debug-ps",
"amd64-ubuntu-2204-icc",
"amd64-ubuntu-2404-clang18-asan",
Expand All @@ -147,14 +144,12 @@
"ppc64le-centos-stream9",
"ppc64le-rhel-8",
"ppc64le-rhel-9",
"ppc64le-ubuntu-2004",
"ppc64le-ubuntu-2004-debug",
"ppc64le-ubuntu-2204",
"ppc64le-ubuntu-2204-debug",
"s390x-rhel-8",
"s390x-rhel-9",
"s390x-ubuntu-2004",
"s390x-ubuntu-2004-debug",
"s390x-ubuntu-2204",
"s390x-ubuntu-2204-debug",
"x86-debian-12",
"x86-debian-12-fulltest",
"x86-debian-12-fulltest-debug",
Expand Down
73 changes: 0 additions & 73 deletions dockerfiles/eco-php-ubuntu-2004.dockerfile

This file was deleted.

213 changes: 0 additions & 213 deletions dockerfiles/ecofiles/test-php.sh

This file was deleted.

Loading