From d176d21c493c4c23f57729f230bb302b5547970f Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Mon, 24 May 2021 12:48:03 +0200
Subject: [PATCH] Updated CI
---
.gitlab-ci.yml | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a70203..b6f236d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,8 @@ stages:
tags:
- docker
rules:
- - if: '$CI_COMMIT_BRANCH != "master"'
- when: never
- - changes:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
- gms-client/gms-client/*
build_gms_client:
@@ -42,9 +41,8 @@ test_gms:
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv
coverage: '/coverage=\d+\.\d+/'
rules:
- - if: '$CI_COMMIT_BRANCH != "master"'
- when: never
- - changes:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
- gms/*
deploy_gms_client:
@@ -66,9 +64,8 @@ dockerize_db:
- docker build -t "${CI_REGISTRY_IMAGE}/database" -f database/Dockerfile .
- docker push "${CI_REGISTRY_IMAGE}/database"
rules:
- - if: '$CI_COMMIT_BRANCH != "master"'
- when: never
- - changes:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
- database/*
- gms/src/main/resources/sql/*
@@ -81,8 +78,7 @@ dockerize_gms:
- docker build -t "${CI_REGISTRY_IMAGE}" -f gms/Dockerfile .
- docker push "${CI_REGISTRY_IMAGE}"
rules:
- - if: '$CI_COMMIT_BRANCH != "master"'
- when: never
- - changes:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
- gms/*
- gms-ui/*
--
GitLab