From 55ad1b29e2e69613b077a02687b00ea007e908af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 18 Feb 2025 14:38:24 +0200 Subject: [PATCH] ci: Remove cmake before running the meson build The meson cmake dependency resolver is broken. Part-of: --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab045107a..52a95778e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,6 +145,8 @@ meson shared: variables: CI_ARTIFACTS_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/" script: + # Remove cmake because the meson cmake dependency resolver is broken + - apt purge cmake -y - meson build --default-library=shared --prefix=$(pwd)/install --fatal-meson-warnings - ninja -C build install - ./ci/check-installed.py install @@ -161,6 +163,8 @@ meson static: extends: .meson needs: [ "trigger" ] script: + # Remove cmake because the meson cmake dependency resolver is broken + - apt purge cmake -y - meson build --default-library=static --prefix=$(pwd)/install -Dsodium-source=built-in - ninja -C build install - ./ci/generate-static-test.py test-static-link-all