From 2af954a21a7c481ee366e629a4ea8f1f741a5fcf Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksandermj@chromium.org>
Date: Mon, 10 Apr 2023 15:30:06 +0000
Subject: [PATCH] ci: always build with -Dwerror=true

Selecting the build type as release limits the amount of warnings that
are enabled, so ensure we always build with warnings treated as errors
so that we don't miss any warning that would happen on debug builds.
---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e2d2a93..5ee40acd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,7 +81,7 @@ build-no-qmi:
     - export BUILD_QRTR=false
     - export BUILD_QMI=false
     - *prepare_deps
-    - meson setup build --prefix=/usr -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=true
+    - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=true
     - ninja -C build
     - ninja -C build install
 
@@ -98,7 +98,7 @@ build-qmi-qrtr-no-mbim:
   script:
     - export BUILD_MBIM=false
     - *prepare_deps
-    - meson setup build --prefix=/usr -Dgtk_doc=false -Dqmi=true -Dqrtr=true -Dmbim=false
+    - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=true -Dqrtr=true -Dmbim=false
     - ninja -C build
     - ninja -C build install
 
@@ -116,7 +116,7 @@ build-qmi-no-qrtr-no-mbim:
     - export BUILD_MBIM=false
     - export BUILD_QRTR=false
     - *prepare_deps
-    - meson setup build --prefix=/usr -Dgtk_doc=false -Dqmi=true -Dqrtr=false -Dmbim=false
+    - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=true -Dqrtr=false -Dmbim=false
     - ninja -C build
     - ninja -C build install
 
@@ -135,7 +135,7 @@ build-no-qmi-no-mbim:
     - export BUILD_QRTR=false
     - export BUILD_QMI=false
     - *prepare_deps
-    - meson setup build --prefix=/usr -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false
+    - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false
     - ninja -C build
     - ninja -C build test
     - ninja -C build install
@@ -155,7 +155,7 @@ build-no-qmi-no-mbim-no-tests:
     - export BUILD_QRTR=false
     - export BUILD_QMI=false
     - *prepare_deps
-    - meson setup build --prefix=/usr -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false -Dtests=false
+    - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false -Dtests=false
     - ninja -C build
     - ninja -C build install
 
@@ -174,7 +174,7 @@ build-no-deprecated:
     - export BUILD_QRTR=false
     - export BUILD_QMI=false
     - *prepare_deps
-    - CFLAGS="-DMM_DISABLE_DEPRECATED" meson setup build --prefix=/usr -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false
+    - CFLAGS="-DMM_DISABLE_DEPRECATED" meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false
     - ninja -C build
     - ninja -C build test
     - ninja -C build install
@@ -191,7 +191,7 @@ build-no-suspend-resume:
     - schedules
   script:
     - *prepare_deps
-    - meson setup build --prefix=/usr -Dgtk_doc=false -Dsystemd_suspend_resume=false -Dpowerd_suspend_resume=false
+    - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dsystemd_suspend_resume=false -Dpowerd_suspend_resume=false
     - ninja -C build
     - ninja -C build install
 
@@ -223,7 +223,7 @@ build-single-plugins:
   script:
     - *prepare_deps
     - for PLUGIN in $(grep "plugin_"  meson_options.txt | awk -F"'" '{ print $2 }'); do
-        meson setup build_$PLUGIN --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dauto_features=disabled -D$PLUGIN=enabled;
+        meson setup build_$PLUGIN --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dauto_features=disabled -D$PLUGIN=enabled;
         ninja -C build_$PLUGIN;
       done