Commit ac386d55 authored by Jonathan Swaelens's avatar Jonathan Swaelens
Browse files

:ambulance: fix(gitlab-ci): Set phpcs stage after the php lint stages


Set phpcs stage after the php lint stages

Signed-off-by: default avatarJonathan Swaelens <swaelens.jonathan@opensides.be>
Showing with 15 additions and 15 deletions
+15 -15
...@@ -7,9 +7,9 @@ variables: ...@@ -7,9 +7,9 @@ variables:
stages: stages:
- test-perl - test-perl
- test-php
- test-php-jessie - test-php-jessie
- test-php-stretch - test-php-stretch
- test-php-codesniffer
- test-manpages - test-manpages
- transifex - transifex
...@@ -40,20 +40,6 @@ create_perl_lint_rapport: ...@@ -40,20 +40,6 @@ create_perl_lint_rapport:
script: script:
- perl -cW contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-insert-schema - 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) # PHP lint (jessie)
create_php_lint_rapport_jessie: create_php_lint_rapport_jessie:
image: 5.6.33-cli-jessie image: 5.6.33-cli-jessie
...@@ -74,6 +60,20 @@ create_php_lint_rapport_stretch: ...@@ -74,6 +60,20 @@ create_php_lint_rapport_stretch:
script: script:
- find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l - 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 # generate man pages to test validity
test_manpages: test_manpages:
stage: test-manpages stage: test-manpages
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment