From e0986976c59b0005d1f4669660acfd601c978810 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 19 Mar 2020 11:09:38 +0100
Subject: [PATCH] FEAT gitlab CI with PHP 7.2, 7.3, 7.4

---
 .gitlab-ci.yml | 49 ++++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7a43c0ec03..5fe7b5b2cb2 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,26 @@ before_script:
   - 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.3:
  image: php:7.3-apache
  stage: test
@@ -44,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-7.phar
+   - 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:
@@ -69,32 +89,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-7.phar
-    - chmod +x /usr/local/bin/phpunit
-    - phpunit --no-coverage
-  only:
-    - develop
-
-job_php-7.1:
-  image: php:7.1-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-7.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:
-- 
GitLab