From 9def1836f10634c5c09dff697054a971ac8f896c Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 20 Sep 2018 18:30:07 +0200
Subject: [PATCH] conflict test is in test stage and fix on grep return status
code
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aed17e1eb0..4454a947a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,7 +174,7 @@ build_war:
dependency_conflict_check:
image: maven:latest
- stage: build
+ stage: test
script:
- apt-get update
- apt-get install -y curl gnupg git ant sudo
@@ -182,7 +182,9 @@ dependency_conflict_check:
- apt-get install -y nodejs
- mvn clean install -DskipTests=true
- - mvn dependency:tree -Dverbose | grep conflict > conflicts.txt
+ - set +e
+ - mvn dependency:tree -Dverbose | grep conflict | cat > conflicts.txt
+ - set -e
- conflicts=`cat conflicts.txt| wc -l`
- echo Found conflicts $conflicts ':'
- cat conflicts.txt
--
GitLab