ci/debian: arm64: only install Meson once
We already use `install-meson.sh` so that we can select an appropriate version of Meson. Instead of installing two copies just do it before we begin building anything in the container. Signed-off-by: Matt Jolly <kangie@gentoo.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33725>
This commit is contained in:
@@ -71,7 +71,6 @@ DEPS=(
|
|||||||
libwayland-egl-backend-dev
|
libwayland-egl-backend-dev
|
||||||
"llvm-${LLVM_VERSION}-dev"
|
"llvm-${LLVM_VERSION}-dev"
|
||||||
ninja-build
|
ninja-build
|
||||||
meson
|
|
||||||
openssh-server
|
openssh-server
|
||||||
pkgconf
|
pkgconf
|
||||||
python3-mako
|
python3-mako
|
||||||
@@ -98,7 +97,10 @@ pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesk
|
|||||||
|
|
||||||
pip3 install --break-system-packages -r bin/ci/test/requirements.txt
|
pip3 install --break-system-packages -r bin/ci/test/requirements.txt
|
||||||
|
|
||||||
|
. .gitlab-ci/container/install-meson.sh
|
||||||
|
|
||||||
arch=armhf
|
arch=armhf
|
||||||
|
|
||||||
. .gitlab-ci/container/cross_build.sh
|
. .gitlab-ci/container/cross_build.sh
|
||||||
|
|
||||||
. .gitlab-ci/container/container_pre_build.sh
|
. .gitlab-ci/container/container_pre_build.sh
|
||||||
@@ -111,8 +113,6 @@ arch=armhf
|
|||||||
|
|
||||||
. .gitlab-ci/container/build-libclc.sh
|
. .gitlab-ci/container/build-libclc.sh
|
||||||
|
|
||||||
. .gitlab-ci/container/install-meson.sh
|
|
||||||
|
|
||||||
. .gitlab-ci/container/build-rust.sh
|
. .gitlab-ci/container/build-rust.sh
|
||||||
|
|
||||||
. .gitlab-ci/container/build-bindgen.sh
|
. .gitlab-ci/container/build-bindgen.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user