From 77073b0a93926485f9f85accbdeb50bddfaf0dbe Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Mon, 2 Jul 2018 15:53:09 +0200
Subject: [PATCH] Update the GitLab-CI file
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b26f98e..9d24bf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,9 +28,8 @@ puppet-parser:
--render-as s
--modulepath="$(pwd)/.."
manifests/
- - "[ -d templates ] && find templates/ -type f -name '*.epp' -print0 |
- xargs -0r puppet epp validate --render-as s"
- # TODO: Remove --no-strict-license once a license is in place
+ - "[ -d templates/ ] && find templates/ -type f -name '*.epp' -print0 |
+ xargs -0r puppet epp validate --render-as s || true"
- metadata-json-lint
--no-strict-license
metadata.json
@@ -41,6 +40,6 @@ ruby:
image: ruby:alpine
script:
- "[ -d lib/ ] && find lib/ -type f -name '*.rb' -print0 |
- xargs -0rn1 sh -c 'printf \"$0: \"; cat $0 | ruby -c 2>&1'"
+ xargs -0rn1 sh -c 'printf \"$0: \"; cat $0 | ruby -c 2>&1' || true"
- "[ -d templates/ ] && find templates/ -type f -name '*.erb' -print0 |
- xargs -0rn1 sh -c 'printf \"$0: \"; erb -PxT \"-\" \"$0\" | ruby -c 2>&1'"
+ xargs -0rn1 sh -c 'printf \"$0: \"; erb -PxT \"-\" \"$0\" | ruby -c 2>&1' || true"
--
GitLab