pngcrush.sh

[tt-rss.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf0b19750abfdd7cbeb39eb686ee86cbec2391b1..cd5ecb0d4a7de8b3933d96d7144fbd98dd178ea7 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 phpmd:\r
   image: php:5.6\r
+  when: manual\r
   script:\r
     - sh utils/gitlab-ci/php-lint.sh\r
     - curl -o /usr/bin/phpmd -L http://static.phpmd.org/php/2.6.0/phpmd.phar\r
@@ -20,7 +21,11 @@ phpunit_basic:
   script:\r
     - /etc/init.d/postgresql start\r
     - /usr/local/sbin/init-database.sh\r
-    - sudo -s /bin/bash -u www-data php ./update.php --debug-feed 1\r
+    - sh ./utils/gitlab-ci/check-schema.sh\r
+    - cp utils/gitlab-ci/config-template.php config.php\r
+    - su -s /bin/bash www-data -c "php ./update.php --debug-feed 1"\r
+    - wget -O /usr/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar\r
+    - chmod +x /usr/bin/phpunit\r
     - phpunit tests/*.php\r
 \r
 phpunit_functional:\r