From 833636bbd01a458bdff2baa9d12967f8b1aa68f1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 26 Apr 2017 14:01:25 +0300 Subject: [PATCH] limit CI to phpmd for the time being --- .gitlab-ci.yml | 21 +-- utils/gitlab-ci/check-schema.sh | 5 - utils/gitlab-ci/config-template.php | 207 ---------------------------- utils/gitlab-ci/nginx-default | 81 ----------- utils/gitlab-ci/php-lint.sh | 3 - 5 files changed, 6 insertions(+), 311 deletions(-) delete mode 100644 utils/gitlab-ci/check-schema.sh delete mode 100644 utils/gitlab-ci/config-template.php delete mode 100644 utils/gitlab-ci/nginx-default delete mode 100644 utils/gitlab-ci/php-lint.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46eff28d..60069546 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,8 @@ -image: fox/selenium-ci +image: php:5.6 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 + - curl -o /usr/bin/phpmd -L http://static.phpmd.org/php/2.6.0/phpmd.phar + - chmod +x /usr/bin/phpmd stages: - test @@ -19,7 +11,6 @@ jobs: when: manual stage: test script: - - sh ./utils/gitlab-ci/php-lint.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 + - phpmd.phar include text utils/gitlab-ci/phpmd-ruleset.xml + - phpmd.phar classes text utils/gitlab-ci/phpmd-ruleset.xml + diff --git a/utils/gitlab-ci/check-schema.sh b/utils/gitlab-ci/check-schema.sh deleted file mode 100644 index a7e63ae0..00000000 --- a/utils/gitlab-ci/check-schema.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -export PGPASSWORD=test - -psql -h localhost -q -U test test < schema/ttrss_schema_pgsql.sql diff --git a/utils/gitlab-ci/config-template.php b/utils/gitlab-ci/config-template.php deleted file mode 100644 index abe34442..00000000 --- a/utils/gitlab-ci/config-template.php +++ /dev/null @@ -1,207 +0,0 @@ - System), syslog - logs to system log. - // Setting this to blank uses PHP logging (usually to http server - // error.log). - - define('CONFIG_VERSION', 26); - // Expected config version. Please update this option in config.php - // if necessary (after migrating all new options from this file). - - // vim:ft=php diff --git a/utils/gitlab-ci/nginx-default b/utils/gitlab-ci/nginx-default deleted file mode 100644 index f64e93af..00000000 --- a/utils/gitlab-ci/nginx-default +++ /dev/null @@ -1,81 +0,0 @@ -## -# You should look at the following URL's in order to grasp a solid understanding -# of Nginx configuration files in order to fully unleash the power of Nginx. -# http://wiki.nginx.org/Pitfalls -# http://wiki.nginx.org/QuickStart -# http://wiki.nginx.org/Configuration -# -# Generally, you will want to move this file somewhere, and start with a clean -# file but keep this around for reference. Or just disable in sites-enabled. -# -# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. -## - -# Default server configuration -# -server { - listen 80 default_server; - listen [::]:80 default_server; - - # SSL configuration - # - # listen 443 ssl default_server; - # listen [::]:443 ssl default_server; - # - # Self signed certs generated by the ssl-cert package - # Don't use them in a production server! - # - # include snippets/snakeoil.conf; - - root /builds/; - - # Add index.php to the list if you are using PHP - index index.php index.html index.htm index.nginx-debian.html; - - server_name _; - - location / { - # First attempt to serve request as file, then - # as directory, then fall back to displaying a 404. - try_files $uri $uri/ =404; - autoindex on; - } - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - location ~ \.php$ { - include snippets/fastcgi-php.conf; - - # With php5-cgi alone: - #fastcgi_pass 127.0.0.1:9000; - # With php5-fpm: - fastcgi_pass unix:/var/run/php5-fpm.sock; - } - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} - - -# Virtual Host configuration for example.com -# -# You can move that to a different file under sites-available/ and symlink that -# to sites-enabled/ to enable it. -# -#server { -# listen 80; -# listen [::]:80; -# -# server_name example.com; -# -# root /var/www/example.com; -# index index.html; -# -# location / { -# try_files $uri $uri/ =404; -# } -#} diff --git a/utils/gitlab-ci/php-lint.sh b/utils/gitlab-ci/php-lint.sh deleted file mode 100644 index ceaee146..00000000 --- a/utils/gitlab-ci/php-lint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -exec find . -name "*.php" -print0 | xargs -0 -n1 php -q -l -- 2.39.5