Merge branch 'master' of gitlab.in2p3.fr:cc-in2p3-dev/TMS

.gitlab-ci.yml

@@ -27,10 +27,8 @@ job_test:
   script:
     - cd tms
     - echo "${env_test}" > .env
-    # Install composer
-    - curl -sS https://getcomposer.org/installer | php
-    - php composer.phar install
-    # Install yarn and assets
+
+    ## Install yarn and assets
     - npm cache clean -f
     - npm install -g n
     - n stable
@@ -38,7 +36,10 @@ job_test:
     - export PATH="$HOME/.yarn/bin:$PATH"
     - yarn install --ignore-engines
     - yarn encore dev
-    # Tests
+    ## Install composer
+    - curl -sS https://getcomposer.org/installer | php
+    - php composer.phar install
+    ## Tests
     - vendor/bin/simple-phpunit --configuration phpunit.xml.dist