Merge branch 'ci/workflow_rules' into 'master'

Ci/workflow rules

See merge request fsl/conda/manifest-rules!9

.gitlab-ci.yml

@@ -3,10 +3,12 @@ stages:
   - check-version
 
 
-# Don't run on merge requests
+# Don't run pipeline on MRs
 workflow:
   rules:
-    - if: '$CI_MERGE_REQUEST_ID == null'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - when: always
 
 
 test:

manifest-gitlab-ci.yml

@@ -18,10 +18,12 @@ default:
     - python -m pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/manifest-rules.git
 
 
-# Don't run pipeline on merge requests
+# Don't run pipeline on MRs
 workflow:
   rules:
-    - if: '$CI_COMMIT_TAG != null || $CI_COMMIT_BRANCH != null'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - when: always
 
 
 # Manifest and environment files can only be published

manifest_rules/__init__.py

 #!/usr/bin/env python
 
 
-__version__ = '0.3.5'
+__version__ = '0.3.6'