Simplify job if

internetguru · May 9, 2023 · e183513 · e183513
1 parent 332aaaa
commit e183513
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/gitlab-stages.yml b/gitlab-stages.yml
@@ -18,6 +18,9 @@ variables:
   ACADEMY_DOCKER_IMAGE: ${ACADEMY_DEFAULT_DOCKER_IMAGE}
   ACADEMY_CACHE: "../.academy-cache"
   ACADEMY_EDITABLE: "*.*"
+  ACADEMY_DISTRIBUTE: manual
+  ACADEMY_EXECUTE: manual
+  ACADEMY_EVALUATE: manual
 
 cache:
   - key: academy-cache
@@ -135,9 +138,7 @@ distribute:
             <<< "${users}"
         fi
   rules:
-    - if: '$ACADEMY_DISTRIBUTE == "always"'
-      when: always
-    - when: manual
+    - when: $ACADEMY_DISTRIBUTE
   allow_failure: true
 
 execute:
@@ -168,9 +169,7 @@ execute:
   rules:
     - if: $CI_COMMIT_BRANCH == "source"
       when: manual
-    - if: '$ACADEMY_EXECUTE == "always"'
-      when: always
-    - when: manual
+    - when: $ACADEMY_EXECUTE
   allow_failure: true
 
 evaluate:
@@ -203,9 +202,7 @@ evaluate:
       when: manual
     - if: $CI_PIPELINE_IID == "1"
       when: manual
-    - if: $ACADEMY_EVALUATE == "always"
-      when: always
-    - when: manual
+    - when: $ACADEMY_EVALUATE
   allow_failure: true
 
 meta: