diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dfa8880222fbf8b187b087619f0a0aa7ac6c383..4233e33aa6873fb6448711922e8eb22c730df7d7 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ job_php-7.2: #- npm set registry https://registry.npmjs.org/ #- npm install - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml - - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-8.phar + - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar - chmod +x /usr/local/bin/phpunit #- cd App/MaarchRM - phpunit --coverage-text --colors=never -c phpunit.xml diff --git a/ci/docker_install_php.sh b/ci/docker_install_php.sh index 9acacbe21278c231bd19f0eba7db7aede312d941..aa3d3fad3c06001bec688b4fb83ffd82ee15b91f 100755 --- a/ci/docker_install_php.sh +++ b/ci/docker_install_php.sh @@ -8,7 +8,7 @@ set -xe apt-get install -y libpq-dev libxml2-dev libxslt1-dev \ && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ && docker-php-ext-install pdo_pgsql pgsql xsl \ -&& pecl install xdebug \ +&& pecl install xdebug-2.6.0 \ && docker-php-ext-enable xdebug