From d64761cd670bfb432f87b78df24a44c1fbedd943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Wed, 10 Jun 2020 11:36:50 +0200
Subject: [PATCH] Try to combine rules and only

---
 .gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3a095f4a..c82852230 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,6 +97,12 @@ spotbugs:
     - echo $DOCKERHUB_PW | docker login -u $DOCKERHUB_ID --password-stdin
     - docker push $DOCKERHUB_ORG/$IMAGE_NAME
     - docker logout
+  rules:
+    - changes:
+      - ./$JAVA_PROJECT_NAME/**/*
+      - ./application-kafkastreams-commons/**/*
+      when: always
+    - when: manual
   only:
     variables:
       - $DOCKERHUB_ORG
@@ -104,14 +110,10 @@ spotbugs:
       - $DOCKERHUB_PW
       - $IMAGE_NAME
       - $JAVA_PROJECT_NAME
-    changes:
-      - ./$JAVA_PROJECT_NAME/**/*
-      - ./application-kafkastreams-commons/**/*
-      - ./.gitlab-ci.yml
 
 deploy-uc1-kstreams-app:
   extends: .deploy
   variables:
     IMAGE_NAME: "theodolite-uc1-kstreams-app"
-    JAVA_PROJECT_NAME: "uc4-application"
+    JAVA_PROJECT_NAME: "uc1-application"
   
\ No newline at end of file
-- 
GitLab