diff --git a/.github/workflows/build-debian-based.yml b/.github/workflows/build-debian-based.yml index 74c5e0df..a2fa98dd 100644 --- a/.github/workflows/build-debian-based.yml +++ b/.github/workflows/build-debian-based.yml @@ -40,11 +40,11 @@ jobs: - image: debian:sid platforms: linux/amd64, linux/arm64/v8, linux/ppc64le - branch: 10.11 + branch: 11.4 - image: debian:sid platforms: linux/386 - branch: 10.11 + branch: 11.4 tag: debiansid-386 - image: ubuntu:20.04 diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile index 5d911184..ef542cb9 100644 --- a/ci_build_images/debian.Dockerfile +++ b/ci_build_images/debian.Dockerfile @@ -40,7 +40,7 @@ RUN . /etc/os-release \ 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 \ && apt-get update \ - && curl -skO https://raw.githubusercontent.com/MariaDB/server/44e4b93316be8df130c6d87880da3500d83dbe10/debian/control \ + && curl -skO "https://raw.githubusercontent.com/MariaDB/server/$MARIADB_BRANCH/debian/control" \ && mkdir debian \ && mv control debian/control \ && touch debian/rules VERSION debian/not-installed \ @@ -98,3 +98,6 @@ RUN . /etc/os-release \ && apt-get clean ENV WSREP_PROVIDER=/usr/lib/galera/libgalera_smm.so + +# Prevent debian sid runtime error +ENV CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1