ci: improve the rules of the previous commit

.gitlab-ci.yml

@@ -122,6 +122,16 @@ include:
       mv cov-analysis-linux64-* coverity ;
       rm /tmp/cov-analysis-linux64.tgz
 
+.rules_on_success_except_coverity:
+  rules:
+    - if: $COVERITY
+      when: never
+    - when: on_success
+
+.rules_only_on_coverity:
+  rules:
+    - if: $COVERITY
+
 .rules_only_on_mr_and_branch:
   rules:
     - if: $COVERITY
@@ -172,7 +182,7 @@ include:
 
 container_fedora:
   extends:
-    - .rules_only_on_mr_and_branch
+    - .rules_on_success_except_coverity
     - .fedora
     - .fdo.container-build@fedora
   stage: container
@@ -199,27 +209,23 @@ container_alpine:
 
 container_coverity:
   extends:
+    - .rules_only_on_coverity
     - .fedora
     - .coverity
     - .fdo.container-build@fedora
   stage: container
   variables:
     GIT_STRATEGY: none
-  rules:
-    - if: $COVERITY
 
 build_on_fedora_with_docs:
   extends:
+    - .rules_on_success_except_coverity
     - .fedora
     - .fdo.distribution-image@fedora
     - .build
   stage: build
   variables:
     BUILD_OPTIONS: -Dintrospection=enabled -Ddoc=enabled -Dsystem-lua=false
-  rules:
-    - if: $COVERITY
-      when: never
-    - when: on_success
 
 build_on_fedora_no_docs:
   extends:
@@ -263,6 +269,7 @@ build_on_alpine:
 
 build_with_coverity:
   extends:
+    - .rules_only_on_coverity
     - .fedora
     - .coverity
     - .fdo.suffixed-image@fedora
@@ -288,8 +295,6 @@ build_with_coverity:
     paths:
       - build-*/meson-logs
       - cov-int/build-log.txt
-  rules:
-    - if: $COVERITY
 
 shellcheck:
   extends:
@@ -304,6 +309,9 @@ shellcheck:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
         - "**/*.sh"
+    - if: $CI_COMMIT_BRANCH != "master"
+      changes:
+        - "**/*.sh"
 
 linguas_check:
   extends:
@@ -322,6 +330,9 @@ linguas_check:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
         - po/*
+    - if: $CI_COMMIT_BRANCH != "master"
+      changes:
+        - po/*
 
 pages:
   stage: pages