[epiphany/mcatanzaro/ci-werror] ci: avoid -Werror on stable branches

[Marge Bot <marge-bot src gnome org>]

commit 9b8e6e92211286982e39e7d30da25ce06d87a7f3
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Fri Jun 4 10:33:27 2021 -0500

    ci: avoid -Werror on stable branches
    
    We want -Werror on master and we want it for merge requests, but we do
    not want it on stable branches. It's just annoying there.
    
    Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/972>

 .gitlab-ci.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dbb56c28..c9c2d0c51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,13 +25,23 @@ check-code-style:
     paths:
       - ${ESLINT_LOG}
     when: on_failure
+  except:
+    - gnome-*
 
 flatpak:
   extends: '.flatpak'
   variables:
-    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true'
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} -Denable_gsb=true 
--werror'
   except:
     - master
+    - gnome-*
+
+flatpak stable:
+  extends: '.flatpak'
+  variables:
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} -Denable_gsb=true 
-Dsoup2=enabled'
+  only:
+    - gnome-*
 
 flatpak master:
   extends: '.flatpak'
@@ -43,11 +53,11 @@ flatpak master:
 scanbuild:
   extends: '.flatpak'
   variables:
-    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled'
   script:
     - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
     - flatpak build flatpak_app meson --prefix=/app ${CONFIG_OPTS} _build
-    -  flatpak build flatpak_app ninja -C _build scan-build
+    - flatpak build flatpak_app ninja -C _build scan-build
     - bash -c 'if [[ -n "$(ls -A _build/meson-logs/scanbuild/)" ]]; then echo "Scan build log found, 
assuming defects exist"; exit 1; fi'
   artifacts:
     when: on_failure