diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fe7b5b2cb2a8717ef3041ace8f88744511d196b..89c4941dbd88f287559f1398c903c2f955668a04 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,32 +23,32 @@ before_script: #- mv wkhtmltox/bin/wkhtmlto* /usr/bin #- chmod +x /usr/bin/wkhtmlto* #- apt-get install libreoffice -yqq > /dev/null - #- apt-get install xpdf-utils -yqq > /dev/null + #- apt-get install poppler-utils -yqq > /dev/null #- apt-get install imagemagick -yqq > /dev/null #- apt-get install npm -yqq > /dev/null - apt-get install git -yqq > /dev/null - bash ci/docker_install_php.sh > /dev/null - bash ci/docker_install_database.sh > /dev/null -job_php-7.4: - image: php:7.4-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 - - 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-9.phar - - chmod +x /usr/local/bin/phpunit - - phpunit --no-coverage - only: - - develop +# job_php-7.4: +# image: php:7.4-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 +# - 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-9.phar +# - chmod +x /usr/local/bin/phpunit +# - phpunit --no-coverage +# only: +# - develop job_php-7.3: image: php:7.3-apache @@ -64,7 +64,7 @@ job_php-7.3: - cd /var/www/html/MaarchCourrier - mkdir -p /var/www/html/MaarchCourrier - 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-9.phar + - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-8.phar - chmod +x /usr/local/bin/phpunit - phpunit --no-coverage only: