From acd90089a55e1bde1d5ee67312226e6a6752583d 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:38:33 +0200
Subject: [PATCH] Merge rules and only
---
.gitlab-ci.yml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c82852230..bfc884606 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,15 +101,20 @@ spotbugs:
- changes:
- ./$JAVA_PROJECT_NAME/**/*
- ./application-kafkastreams-commons/**/*
+ if:
+ - $DOCKERHUB_ORG
+ - $DOCKERHUB_ID
+ - $DOCKERHUB_PW
+ - $IMAGE_NAME
+ - $JAVA_PROJECT_NAME
when: always
- - when: manual
- only:
- variables:
+ - if:
- $DOCKERHUB_ORG
- $DOCKERHUB_ID
- $DOCKERHUB_PW
- $IMAGE_NAME
- $JAVA_PROJECT_NAME
+ when: manual
deploy-uc1-kstreams-app:
extends: .deploy
--
GitLab