Pārlūkot izejas kodu

Merge branch 'test_ci_2' into feature/V8-5468-ajout-de-la-configuration-des-mo

Olivier Massot 1 gadu atpakaļ
vecāks
revīzija
f050937c3e
2 mainītis faili ar 7 papildinājumiem un 3 dzēšanām
  1. 3 2
      .gitlab-ci.yml
  2. 4 1
      tests/ci_docker_install.sh

+ 3 - 2
.gitlab-ci.yml

@@ -12,12 +12,13 @@ cache:
 
 
 before_script:
 before_script:
   - bash tests/ci_docker_install.sh > /dev/null
   - bash tests/ci_docker_install.sh > /dev/null
+  - php -i | grep ini
+  - php -i | grep memory
   - php -v
   - php -v
 
 
 static_analysis:
 static_analysis:
   script:
   script:
-    - php --version
-    - php -d memory_limit=-1 vendor/bin/phpstan analyse -c phpstan.neon.dist --error-format gitlab > phpstan.json  # Display code quality in MR
+    - php vendor/bin/phpstan analyse -c phpstan.neon.dist --error-format gitlab > phpstan.json  # Display code quality in MR
   artifacts:
   artifacts:
     when: always
     when: always
     reports:
     reports:

+ 4 - 1
tests/ci_docker_install.sh

@@ -56,5 +56,8 @@ php -r "if (hash_file('SHA384', 'composer-setup.php') === file_get_contents('ins
 php composer-setup.php
 php composer-setup.php
 php -r "unlink('composer-setup.php'); unlink('installer.sig');"
 php -r "unlink('composer-setup.php'); unlink('installer.sig');"
 
 
+# Config php
+echo "memory_limit=2096M" > /usr/local/etc/php/conf.d/additional.ini
+
 # Install modules
 # Install modules
-HOST=ci php -d memory_limit=-1 composer.phar install --no-interaction --ignore-platform-reqs
+HOST=ci php composer.phar install --no-interaction --ignore-platform-reqs