From ac386d55a169497588f1966c50895c04f3534ad3 Mon Sep 17 00:00:00 2001
From: Jonathan Swaelens <swaelens.jonathan@opensides.be>
Date: Wed, 28 Feb 2018 15:46:37 +0100
Subject: [PATCH] :ambulance: fix(gitlab-ci): Set phpcs stage after the php
lint stages
Set phpcs stage after the php lint stages
Signed-off-by: Jonathan Swaelens <swaelens.jonathan@opensides.be>
---
.gitlab-ci.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f95f1aeb..e6a53c879 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,9 @@ variables:
stages:
- test-perl
- - test-php
- test-php-jessie
- test-php-stretch
+ - test-php-codesniffer
- test-manpages
- transifex
@@ -40,20 +40,6 @@ create_perl_lint_rapport:
script:
- perl -cW contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-insert-schema
-# PHP codesniffer
-create_php_code_sniffer_rapport:
- stage: test-php
- only:
- - branches
- - tags
- before_script:
- - apt-get update -qq
- - 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' > ./filelist
- - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
-
# PHP lint (jessie)
create_php_lint_rapport_jessie:
image: 5.6.33-cli-jessie
@@ -74,6 +60,20 @@ create_php_lint_rapport_stretch:
script:
- find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
+# PHP codesniffer
+create_php_code_sniffer_rapport:
+ stage: test-php-codesniffer
+ only:
+ - branches
+ - tags
+ before_script:
+ - apt-get update -qq
+ - 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' > ./filelist
+ - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
+
# generate man pages to test validity
test_manpages:
stage: test-manpages
--
GitLab