From 05361276c0d29b81180e2f75cc0fe3ad51ff90a2 Mon Sep 17 00:00:00 2001
From: Dominik Kaminski <kaminski@univention.de>
Date: Wed, 30 Aug 2023 11:19:03 +0000
Subject: [PATCH] chore(ci): Improve rules

---
 .gitlab-ci.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 299007bc..3ffe6f69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -485,9 +485,9 @@ generate-release-artefacts:
 .common-semantic-release:
   image: "registry.souvap-univention.de/souvap/tooling/images/semantic-release-patched:latest"
   rules:
-    - if: "$CI_PIPELINE_SOURCE =~ 'tags|triggers|web|merge_request_event'"
-      when: "never"
-    - when: "always"
+    - if: "$JOB_RELEASE_ENABLED != 'false' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+      when: "always"
+    - when: "never"
   tags: []
 
 common-yaml-linter:
@@ -503,17 +503,7 @@ reuse-linter:
       when: "never"
     - when: "always"
 
-generate-release-version:
-  rules:
-    - if: "$JOB_RELEASE_ENABLED != 'false' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
-      when: "always"
-    - when: "never"
-
 release:
-  rules:
-    - if: "$JOB_RELEASE_ENABLED != 'false' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
-      when: "always"
-    - when: "never"
   script:
     - |
       cat << 'EOF' > ${CI_PROJECT_DIR}/.releaserc