summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-04-26 16:26:53 +0300
committerAndrew Dolgov <[email protected]>2017-04-26 16:26:53 +0300
commit39238155802534f9234835e9fce0fd9c5348221e (patch)
tree80e5f269feed1b8fbf379f1ed02052e8d7355dbe
parent897804cef29e4d7d851985eab921ffad8106b0cf (diff)
ci: check syntax via php first
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--utils/gitlab-ci/php-lint.sh3
-rw-r--r--utils/gitlab-ci/phpmd.sh3
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce6be002a..b66939c49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
phpmd:
image: php:5.6
script:
+ - sh utils/php-lint.sh
- curl -o /usr/bin/phpmd -L http://static.phpmd.org/php/2.6.0/phpmd.phar
- chmod +x /usr/bin/phpmd
- sh utils/gitlab-ci/phpmd.sh
diff --git a/utils/gitlab-ci/php-lint.sh b/utils/gitlab-ci/php-lint.sh
new file mode 100644
index 000000000..172abd873
--- /dev/null
+++ b/utils/gitlab-ci/php-lint.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+exec find . -name "*.php" -not -path "*/lib/*" -print0 | xargs -0 -n1 php -l
diff --git a/utils/gitlab-ci/phpmd.sh b/utils/gitlab-ci/phpmd.sh
index e5bad474d..ec3ec3033 100644
--- a/utils/gitlab-ci/phpmd.sh
+++ b/utils/gitlab-ci/phpmd.sh
@@ -1,7 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh -i -e
#phpmd include text utils/gitlab-ci/phpmd-ruleset.xml
#phpmd classes text utils/gitlab-ci/phpmd-ruleset.xml
FILES=$(ls -dm *.php | tr -d " "| tr -d "\n")
phpmd $FILES text utils/gitlab-ci/phpmd-ruleset.xml
+