diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh index 70bce5f9dfa..106677c3403 100644 --- a/.gitlab-ci/container/debian/arm64_build.sh +++ b/.gitlab-ci/container/debian/arm64_build.sh @@ -95,8 +95,7 @@ arch=armhf . .gitlab-ci/container/build-libclc.sh -# We need at least 1.4.0 for rusticl -pip3 install --break-system-packages 'meson==1.4.0' +. .gitlab-ci/container/install-meson.sh . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index 3fc891ef573..e41d3b3081d 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -95,8 +95,7 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ # Needed for ci-fairy, this revision is able to upload files to S3 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 -# We need at least 1.4.0 for rusticl -pip3 install --break-system-packages 'meson==1.4.0' +. .gitlab-ci/container/install-meson.sh . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh index d0ab414f904..00493c6d78b 100644 --- a/.gitlab-ci/container/fedora/x86_64_build.sh +++ b/.gitlab-ci/container/fedora/x86_64_build.sh @@ -101,8 +101,7 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2 cd $XORGMACROS_VERSION; ./configure; make install; cd .. rm -rf $XORGMACROS_VERSION -# We need at least 1.4.0 for rusticl -pip install meson==1.4.0 +. .gitlab-ci/container/install-meson.sh . .gitlab-ci/container/build-mold.sh diff --git a/.gitlab-ci/container/install-meson.sh b/.gitlab-ci/container/install-meson.sh new file mode 100644 index 00000000000..7add453fc90 --- /dev/null +++ b/.gitlab-ci/container/install-meson.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# We need at least 1.4.0 for rusticl +pip3 install --break-system-packages 'meson==1.4.0'