From 2e22147f00c753243d24bbc7633c316790c3a020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gangloff?= <contact@maelgangloff.fr>
Date: Tue, 31 Dec 2024 00:11:24 +0100
Subject: [PATCH] ci: update symfony.yml

---
 .github/workflows/eslint.yml  | 31 -------------------------------
 .github/workflows/symfony.yml | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/eslint.yml

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
deleted file mode 100644
index 155e3fb..0000000
--- a/.github/workflows/eslint.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: ESLint
-
-on:
-    push:
-        branches: [ "master" ]
-    pull_request:
-        branches: [ "master" ]
-
-permissions:
-    contents: read
-
-jobs:
-    frontend:
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v3
-
-            -   name: Cache Node modules
-                uses: actions/cache@v3
-                with:
-                    path: node_modules
-                    key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
-                    restore-keys: |
-                        ${{ runner.os }}-node-
-
-            -   name: Install frontend dependencies
-                run: yarn install
-
-            -   name: Run ESLint
-                run: yarn run eslint
diff --git a/.github/workflows/symfony.yml b/.github/workflows/symfony.yml
index 21bdded..fc5f384 100644
--- a/.github/workflows/symfony.yml
+++ b/.github/workflows/symfony.yml
@@ -10,7 +10,7 @@ permissions:
     contents: read
 
 jobs:
-    symfony-tests:
+    symfony:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout code
@@ -33,8 +33,22 @@ jobs:
             -   name: Install backend dependencies
                 run: composer install --prefer-dist --no-progress --no-suggest --optimize-autoloader
 
+            -   name: Cache Node modules
+                uses: actions/cache@v3
+                with:
+                    path: node_modules
+                    key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-node-
+
+            -   name: Install frontend dependencies
+                run: yarn install
+
             -   name: Run PHP-CS-Fixer
                 run: vendor/bin/php-cs-fixer fix --dry-run --diff
 
             -   name: Run PHPStan
                 run: vendor/bin/phpstan analyse
+
+            -   name: Run ESLint
+                run: yarn run eslint
\ No newline at end of file