From 7548b4865f2c6c08a84fb59216a98af75bed7624 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 16 May 2024 12:28:35 +0100 Subject: [PATCH 1/2] tests: Fix clang compilation failure due to unrecognised option in pragma Sigh. ``` ../glib/tests/atomic.c:139:32: error: unknown warning group '-Wdiscarded-qualifiers', ignored [-Werror,-Wunknown-warning-option] \#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" ^ 1 error generated. ``` Signed-off-by: Philip Withnall --- glib/tests/atomic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glib/tests/atomic.c b/glib/tests/atomic.c index 82c5c9e14..dff493d27 100644 --- a/glib/tests/atomic.c +++ b/glib/tests/atomic.c @@ -136,6 +136,8 @@ test_types (void) * to make sure that we don’t warn when built against older third party code. */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" +#pragma GCC diagnostic ignored "-Wpragmas" +#pragma GCC diagnostic ignored "-Wunknown-warning-option" #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" g_atomic_pointer_set (&vp_str_vol, NULL); g_atomic_pointer_set (&vp_str, str); From c98805e5a18b3e26a9499cf144fab2323efeb8c9 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 16 May 2024 12:39:01 +0100 Subject: [PATCH 2/2] ci: Temporarily run the FreeBSD on a schedule rather than every commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The runner is currently offline and we can’t have that blocking development. See: https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1503 Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8dc428c3..35b6ac758 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -602,7 +602,7 @@ vs2017-x64-static: - _build/meson-logs freebsd-13-x86_64: - extends: .only-origin-or-manual + extends: .only-schedules-or-manual stage: build tags: - freebsd-13