diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 212dd9c25329e80785c0b2c16e26773b9411411b..6dd8b3b45f58f3d302e227afc9d7280c4f66e902 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ services: - - postgres:9.5 + - postgres:9.6 variables: POSTGRES_DB: "MaarchCourrier" @@ -99,28 +99,3 @@ job_php-7.1: - phpunit --coverage-text --colors=never -c phpunit.xml only: - develop - -job_php-7.0: - image: php:7.0-apache - stage: test - script: - - mkdir -p /opt/maarch/docservers/indexes/{letterbox_coll,attachments_coll,version_attachments_coll} - - mkdir -p /opt/maarch/docservers/{ai,manual,manual_attachments,templates} - - mkdir -p /opt/maarch/docservers/{convert_attachments,convert_attachments_version,convert_mlb} - - mkdir -p /opt/maarch/docservers/{fulltext_attachments,fulltext_attachments_version,fulltext_mlb} - - mkdir -p /opt/maarch/docservers/{thumbnails_attachments,thumbnails_attachments_version,thumbnails_mlb} - - mkdir -p /var/www/html/ - - cp -R /builds/maarch/MaarchCourrier/ /var/www/html/ - - cd /var/www/html/MaarchCourrier - - mkdir -p /var/www/html/MaarchCourrier - #- curl -sL https://deb.nodesource.com/setup_7.x | bash - - #- apt-get install -yqq nodejs - #- npm install npm@latest -g - #- 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-6.phar - - chmod +x /usr/local/bin/phpunit - - phpunit --coverage-text --colors=never -c phpunit.xml - only: - - develop