From 9252e92da02f801708849b59df35cdf65bfb7fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 3 May 2023 23:00:24 +0200
Subject: [PATCH] gitlabci to new skeleton

---
 .gitlab-ci.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f1d75ed5..54c2cbfee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@
 # Select what we should cache between builds
 cache:
     paths:
-        - tests/app/vendor/
         - .cache
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
@@ -28,7 +27,7 @@ variables:
     REDIS_PORT: 6379
     REDIS_URL: redis://redis:6379
     # change vendor dir to make the app install into tests/apps
-    COMPOSER_VENDOR_DIR: tests/app/vendor
+    #COMPOSER_VENDOR_DIR: /vendor
     DEFAULT_CARRIER_CODE: BE
 
 stages:
@@ -49,7 +48,7 @@ build:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 code_style:
     stage: Tests
@@ -63,7 +62,7 @@ code_style:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 phpstan_tests:
     stage: Tests
@@ -77,7 +76,7 @@ phpstan_tests:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 rector_tests:
     stage: Tests
@@ -91,7 +90,7 @@ rector_tests:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 # psalm_tests:
 #     stage: Tests
@@ -111,13 +110,12 @@ unit_tests:
     # until we fix testes
     allow_failure: true
     script:
-        - php tests/app/bin/console doctrine:migrations:migrate -n
-        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
-        - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
-        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
+        - php tests/console doctrine:migrations:migrate -n
+        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n
+        - php -d memory_limit=2G tests/console cache:clear --env=test
         - php -d memory_limit=4G bin/phpunit --colors=never
     artifacts:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/