From 950fdda2569a9c43cae405c2c115bd91aa7557f6 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 18 Jun 2018 12:39:37 +0200
Subject: [PATCH] FEAT gitlab ci yml
---
.gitlab-ci.yml | 2 +-
ci/docker_install_php.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dfa8880222..4233e33aa68 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 9acacbe2127..aa3d3fad3c0 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
--
GitLab