From 98f63d09c0f5fe319838f10d4404241bfa699b66 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 May 2023 10:16:34 -0400 Subject: [PATCH 1/4] ci: Use the same options for the scan-build job In particular, not building the tests should help cutting down on time spent linking. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a38c67b5d..b571db7994 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -349,6 +349,8 @@ static-scan: - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} + ${BACKEND_FLAGS} + ${FEATURE_FLAGS} _scan_build - ninja -C _scan_build scan-build artifacts: From 70552506923185547a896e5e37283fd3650e98b3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 May 2023 10:18:22 -0400 Subject: [PATCH 2/4] ci: Stop special-casing broadway We are not running the broadway tests anymore, so no need to special-case them in the run-test.sh script either. --- .gitlab-ci/run-tests.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index 96455eacc7..53d73beb36 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -69,9 +69,6 @@ case "${backend}" in --no-suite=flaky \ --no-suite=gsk-compare-opengl - # don't let Broadway failures fail the run, for now - exit_code=0 - kill ${server} ;; From 41219ae4892403bf13fa0d59b8ee54a3577869d6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 May 2023 19:53:42 -0400 Subject: [PATCH 3/4] gtk-demo: Fix a typo --- demos/gtk-demo/listview_settings2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/gtk-demo/listview_settings2.c b/demos/gtk-demo/listview_settings2.c index 4f3e87fb68..1447c1c6ed 100644 --- a/demos/gtk-demo/listview_settings2.c +++ b/demos/gtk-demo/listview_settings2.c @@ -6,7 +6,7 @@ * It demonstrates how to implement support for sections with GtkListView. * * It also shows how to quickly flatten a large tree of items into a list - * that can be filtered to find the itmes one is looking for. + * that can be filtered to find the items one is looking for. */ #include From 59343e4efb393566ba185f872601f63bcfdc1cdb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 May 2023 20:14:58 -0400 Subject: [PATCH 4/4] gtk-demo: Rename the new Settings demo "v2" does not look great in the sidebar. Lets call this "Alternative Settings". --- demos/gtk-demo/listview_settings2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/gtk-demo/listview_settings2.c b/demos/gtk-demo/listview_settings2.c index 1447c1c6ed..1b4820cf71 100644 --- a/demos/gtk-demo/listview_settings2.c +++ b/demos/gtk-demo/listview_settings2.c @@ -1,7 +1,7 @@ -/* Lists/Settings v2 +/* Lists/Alternative Settings * #Keywords: GtkListHeaderFactory, GtkSectionModel * - * This demo shows a settings viewer for GSettings. + * This demo shows an alternative settings viewer for GSettings. * * It demonstrates how to implement support for sections with GtkListView. *