From 1f00e6fb28a6b102d15bda593c42c37d281bdb9b Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Sat, 1 Mar 2025 22:49:28 +1000 Subject: [PATCH] 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 Part-of: --- .gitlab-ci/container/debian/arm64_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh index 6ef419f077b..04d0a99abca 100644 --- a/.gitlab-ci/container/debian/arm64_build.sh +++ b/.gitlab-ci/container/debian/arm64_build.sh @@ -71,7 +71,6 @@ DEPS=( libwayland-egl-backend-dev "llvm-${LLVM_VERSION}-dev" ninja-build - meson openssh-server pkgconf 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 +. .gitlab-ci/container/install-meson.sh + arch=armhf + . .gitlab-ci/container/cross_build.sh . .gitlab-ci/container/container_pre_build.sh @@ -111,8 +113,6 @@ arch=armhf . .gitlab-ci/container/build-libclc.sh -. .gitlab-ci/container/install-meson.sh - . .gitlab-ci/container/build-rust.sh . .gitlab-ci/container/build-bindgen.sh