From 1f59e8939190d6bdcab60490e56b35809372e353 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 26 Sep 2024 13:29:52 +0100 Subject: [PATCH] ci: Re-enable fatal warnings for FreeBSD CI Now that the CI runner has Meson 1.4, we can revert commit eda5bb386bcd0ee83714f771c81ade442c38fc30 and re-enable fatal warnings. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac9fcc7a7..0b884f29f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -656,14 +656,7 @@ freebsd-13-x86_64: before_script: - bash .gitlab-ci/show-execution-environment.sh script: - # FIXME: We can’t use ${MESON_COMMON_OPTIONS} here because the FreeBSD 13 - # runner has Meson 1.3 installed. This has an API hole where previous - # methods of getting paths from files() objects are rejected as deprecated, - # but no replacements are available. Hence, we can’t build with - # --fatal-meson-warnings. This should be fixed in Meson 1.4. It’s also fine - # with Meson 1.2.3 (which is what we use on all the other CI runners). - # See https://github.com/GNOME/glib/commit/71061fdcb33b8c26f5f8467cb3ac10704d65c87d - - meson setup --buildtype debug --wrap-mode=nodownload + - meson setup ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false