From bc835f4cbd2dbf8422e83dd07983cb3d8424939c Mon Sep 17 00:00:00 2001
From: jswaelens <jonathan.swaelens@opensides.be>
Date: Mon, 26 Feb 2018 22:51:37 +0100
Subject: [PATCH] Merge branch
'5780-update-php-codesniffer-gitlab-ci-so-that-it-stop-on-error' into
'1.3-dev'
Resolve "Update php-codesniffer gitlab-ci so that it stop on error"
Closes #5780
See merge request fusiondirectory/fd!149
(cherry picked from commit 3031ef5e070e19c974c58ab311551484b6377474)
f3e9714f :ambulance: fix(gitlab-ci) Update php-codesniffer gitlab-ci
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 446b9d345..77f5948e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,8 @@ create_php_code_sniffer_rapport:
- apt-get install -y -qq git php-cli php-codesniffer
script:
- git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
- - find . -type f -name '*.php' -o -name '*.inc' -exec phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml "{}" \;
+ - find . -type f -name '*.php' -o -name '*.inc' > ./filelist
+ - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
# generate man pages to test validity
test_manpages:
--
GitLab