Merge branch 'matthiasc/for-main' into 'main'

ci: Use the same options for the scan-build job

See merge request GNOME/gtk!5953

3 files changed, 5 insertions, 6 deletions

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:
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}
     ;;
 
diff --git a/demos/gtk-demo/listview_settings2.c b/demos/gtk-demo/listview_settings2.c
index 4f3e87fb68..1b4820cf71 100644
--- a/demos/gtk-demo/listview_settings2.c
+++ b/demos/gtk-demo/listview_settings2.c
@@ -1,12 +1,12 @@
-/* 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.
  *
  * 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 <gtk/gtk.h>