fix(ci): Fix CI with new Dockerfile

Author: mihani

.docker/data/history.dist

@@ -1 +1 @@
-# Keep the command history used in container
+# Keep the command history used in container

.editorconfig

@@ -0,0 +1,10 @@
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[{compose.yaml,compose.override.yaml,compose.yml,compose.override.yml}]
+indent_size = 2
+
+[{.github/*/*.yaml,.github/*/*.yml}]
+indent_size = 2

.github/workflows/ci.yml

@@ -113,11 +113,19 @@ jobs:
               'docker/dockerfiles/mysqltest/Dockerfile'
             ) }}
 
-      - name: Delete symfony cache
-        run: rm -rf var/cache/test
-
       - name: Tests - Functional
-        run: make test-functional
+        run: |
+          cp docker.env docker.env.local
+          cp .env.dist .env
+          mkdir -p ./htdocs/uploads -p ./tmp
+          docker compose up -d
+          docker compose exec --user localUser apachephp composer install --no-scripts
+          docker compose run --rm node bash -c "npm install --legacy-peer-deps && npm run build"
+          cat ./.docker/mysql/reset-db.sql | docker compose run -T --rm db /opt/mysql_no_db
+          docker compose exec --user localUser apachephptest php bin/phinx migrate
+          docker compose exec --user localUser apachephptest php bin/phinx seed:run
+          docker compose exec --user localUser apachephptest ./bin/behat
+          cat var/logs/test.deprecations.log | cut -d "]" -f 2 | awk '{$$1=$$1};1' | sort | uniq -c | sort -nr > var/logs/test.deprecations_grouped.log
 
       - uses: actions/upload-artifact@v4
         with:
@@ -142,13 +150,14 @@ jobs:
           key: |
             docker-${{ runner.os }}-${{ hashFiles(
               'compose.yml',
-              'docker/dockerfiles/apachephp/Dockerfile',
+              'Dockerfile',
               'docker/dockerfiles/mysql/Dockerfile',
               'docker/dockerfiles/mysqltest/Dockerfile'
             ) }}
 
-      - name: Delete symfony cache
-        run: rm -rf var/cache/test
-
       - name: Tests - Integration
-        run: make test-integration-ci
+        run: |
+          cp docker.env docker.env.local
+          cp -n .env.dist .env
+          docker compose up -d
+          docker compose exec -u localUser apachephp ./bin/phpunit --testsuite integration

Makefile

@@ -19,6 +19,8 @@ install:
 
 	$(DOCKER_COMPOSE_BIN) up -d --build
 
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp composer install --no-scripts
+
 	# Build les assets du projet
 	$(MAKE) --no-print-directory install-assets
 	$(MAKE) --no-print-directory build-assets
@@ -83,14 +85,15 @@ cs-fix:
 test-functional:
 	$(DOCKER_COMPOSE_BIN) stop dbtest apachephptest mailcatcher
 	$(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest mailcatcher
-	$(DOCKER_COMPOSE_BIN) exec -u localUser apachephp bash -c "rm -f /var/www/html/var/logs/test.deprecations.log"
+	$(DOCKER_COMPOSE_BIN) exec -u localUser apachephptest bash -c "rm -f /var/www/html/var/logs/test.deprecations.log"
 	$(DOCKER_COMPOSE_BIN) exec -u localUser apachephp ./bin/behat
+	cat var/logs/test.deprecations.log | cut -d "]" -f 2 | awk '{$$1=$$1};1' | sort | uniq -c | sort -nr > var/logs/test.deprecations_grouped.log
 	$(DOCKER_COMPOSE_BIN) stop dbtest apachephptest mailcatcher
 
 ### Tests d'intégration avec start/stop des images docker
 test-integration-ci:
 	$(DOCKER_COMPOSE_BIN) stop dbtest apachephptest
-	$(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest
+	$(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest apachephp
 	$(DOCKER_COMPOSE_BIN) exec -u localUser apachephp composer install --no-scripts
 	$(DOCKER_COMPOSE_BIN) exec -u localUser apachephp ./bin/phpunit --testsuite integration
 	$(DOCKER_COMPOSE_BIN) stop dbtest apachephptest