Olivier Massot 1 year ago
parent
commit
1865abef9a
2 changed files with 5 additions and 8 deletions
  1. 2 7
      .gitlab-ci.yml
  2. 3 1
      tests/ci_docker_install.sh

+ 2 - 7
.gitlab-ci.yml

@@ -16,8 +16,7 @@ before_script:
 
 static_analysis:
   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:
     when: always
     reports:
@@ -25,11 +24,7 @@ static_analysis:
 
 code_style:
   script:
-    - php vendor/bin/php-cs-fixer check --config=.php-cs-fixer.dist.php --diff -v --format=gitlab --using-cache=no
-  artifacts:
-    when: always
-    reports:
-      codequality: phpstan.json
+    - php vendor/bin/php-cs-fixer check --config=.php-cs-fixer.dist.php
 
 unit:
   stage: test

+ 3 - 1
tests/ci_docker_install.sh

@@ -60,5 +60,7 @@ php -r "if (hash_file('SHA384', 'composer-setup.php') === file_get_contents('ins
 php composer-setup.php
 php -r "unlink('composer-setup.php'); unlink('installer.sig');"
 
+echo "memory_limit = 512M" >> /usr/local/etc/php/conf.d/memory-limit.ini
+
 # 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