From e2ceb203879ac4f192f561597a7bff327cfabb45 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Mon, 25 Apr 2022 07:44:47 +0000
Subject: [PATCH] L2SS-752: Attempt to resolve detached pipelines using rules

---
 .gitlab-ci.yml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5a14f0b5..a8389692e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,17 +64,28 @@ docker_store_images_master_tag:
     refs:
       - tags
       - master
+# https://stackoverflow.com/questions/68955071/how-to-disable-detached-pipelines-in-gitlab
 docker_store_images_changes:
   extends: .base_docker_store_images
-  only:
-    refs:
-      - merge_requests
-    changes:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$CI_COMMIT_TAG == null'
+      when: never
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      when: never
+    - changes:
       - docker-compose/.env
-  except:
-    refs:
-      - tags
-      - master
+      when: always
+#  only:
+#    refs:
+#      - merge_requests
+#    changes:
+#      - docker-compose/.env
+#  except:
+#    refs:
+#      - tags
+#      - master
 docker_build_image_all:
   extends: .base_docker_images
   only:
-- 
GitLab