X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=cd5ecb0d4a7de8b3933d96d7144fbd98dd178ea7;hb=50052fb78a3a9d1bb3fa488e7fd7b23125c38124;hp=ed7c32d6f744cbf2177226d67373c3fc8b0ae15b;hpb=94eedc29c01a30a32cf10e14fd0d0a039504ca8a;p=tt-rss.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed7c32d6..cd5ecb0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,44 @@
-image: fox/selenium-ci
+phpmd:
+  image: php:5.6
+  when: manual
+  script:
+    - sh utils/gitlab-ci/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
 
-before_script:
-  - pwd
-  - ln -s `pwd` ../../tt-rss
-  - cp utils/gitlab-ci/nginx-default /etc/nginx/sites-enabled/default
-  - /etc/init.d/postgresql start
-  - /etc/init.d/nginx start
-  - /etc/init.d/php5-fpm start
-  - /usr/local/sbin/init-database.sh
-  - cp utils/gitlab-ci/config-template.php config.php
-  - chmod -R 777 cache lock feed-icons
-  - /usr/local/sbin/init-selenium.sh
+schema:
+  image: fox/selenium-ci
+  when: manual
+  script:
+    - /etc/init.d/postgresql start
+    - /usr/local/sbin/init-database.sh
+    - sh ./utils/gitlab-ci/check-schema.sh
 
-stages:
-  - test
+phpunit_basic:
+  image: fox/selenium-ci
+  when: manual
+  script:
+    - /etc/init.d/postgresql start
+    - /usr/local/sbin/init-database.sh
+    - sh ./utils/gitlab-ci/check-schema.sh
+    - cp utils/gitlab-ci/config-template.php config.php
+    - su -s /bin/bash www-data -c "php ./update.php --debug-feed 1"
+    - wget -O /usr/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar
+    - chmod +x /usr/bin/phpunit
+    - phpunit tests/*.php
 
-jobs:
-  only:
-    - triggers
-  stage: test
+phpunit_functional:
+  image: fox/selenium-ci
+  when: manual
   script:
-    - sh ./utils/gitlab-ci/php-lint.sh 
+    - /etc/init.d/postgresql start
+    - /etc/init.d/nginx start
+    - /etc/init.d/php5-fpm start
+    - /usr/local/sbin/init-database.sh
     - sh ./utils/gitlab-ci/check-schema.sh
-    - su -s /bin/bash -m www-data -c "php ./update.php --debug-feed 1"
-    - phpunit ./tests/functional/*.php
+    - ln -s `pwd` ../../tt-rss
+    - cp utils/gitlab-ci/config-template.php config.php
+    - chmod -R 777 cache lock feed-icons
+    - /usr/local/sbin/init-selenium.sh
+    - phpunit tests/functional/*.php