From 830297d35234b3fc816d70f22c9f4e23fe5cec4f Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Fri, 21 May 2021 17:35:56 +0000
Subject: [PATCH] Update apps/cic-eth/.gitlab-ci.yml

---
 apps/cic-eth/.gitlab-ci.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index 5491260b..4b79713d 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -3,28 +3,30 @@
         APP_NAME: cic-eth
         DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
 
-.cic_eth_changes_target:
-    rules:
-        - changes:
-            - $CONTEXT/$APP_NAME/*
-
 # build-mr-cic-eth:
 #     extends:
-#         - .cic_eth_changes_target
 #         - .py_build_merge_request
 #         - .cic_eth_variables
 
 build-mr-unittest-cic-eth:
     extends:
-        - .cic_eth_changes_target
         - .cic_eth_variables
         - .py_build_unittest_merge_request
+    rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+      - $CONTEXT/$APP_NAME/**/*
+      when: always
 
 test-mr-unittest-cic-eth:
     extends:
-        - .cic_eth_changes_target
         - .cic_eth_variables
         - .py_unittest_merge_request
+    rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+      - $CONTEXT/$APP_NAME/**/*
+      when: always
     
 
 build-push-cic-eth: