Update laravel.yml

Author: AllanKoder

.github/workflows/laravel.yml

@@ -2,35 +2,57 @@ name: Feature Tests
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
   pull_request:
   workflow_dispatch:
 
+env:
+  APP_NAME: "Computer Science Resources"
+  APP_ENV: testing
+  APP_KEY: base64:7aYe15aBsSh6a2ScVwj1JfYjQKUmz9Z5X/GSe64joHA=
+  APP_DEBUG: 'true'
+  APP_TIMEZONE: UTC
+  APP_URL: http://localhost
+
+  DB_CONNECTION: mysql
+  DB_HOST: 127.0.0.1
+  DB_PORT: 3306
+  DB_DATABASE: testing
+  DB_USERNAME: root
+  DB_PASSWORD: password
+
 jobs:
+  # --------------------------------------------------------------
+  # 1. PHP dependencies setup
+  # --------------------------------------------------------------
   php-setup:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
+  
       - name: Set up PHP & Composer
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.3
           extensions: mbstring, pdo, mysql, bcmath, tokenizer
           tools: composer
-
-      - name: Install Composer dependencies
-        run: composer install --no-interaction --prefer-dist
-
+  
       - name: Cache Composer dependencies
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-php-
+            ${{ runner.os }}-composer-
+  
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --prefer-dist
 
+  # --------------------------------------------------------------
+  # 2. Node/Vite build
+  # --------------------------------------------------------------
   frontend-setup:
     runs-on: ubuntu-latest
     steps:
@@ -60,13 +82,15 @@ jobs:
         uses: actions/cache@v3
         with:
           path: public/build
-          key: ${{ runner.os }}-vite-${{ hashFiles('package-lock.json', 'vite.config.js') }}
-          restore-keys: |
-            ${{ runner.os }}-vite-
+          key: ${{ runner.os }}-vite-${{ github.sha }}
 
-  test-setup:
+  # --------------------------------------------------------------
+  # 3. Run tests 
+  # --------------------------------------------------------------
+  run-feature-tests:
     runs-on: ubuntu-latest
     needs: [php-setup, frontend-setup]
+
     services:
       mysql:
         image: mysql:8.0
@@ -80,53 +104,31 @@ jobs:
           --health-interval=10s
           --health-timeout=5s
           --health-retries=5
-
-    env:
-      APP_NAME: "Computer Science Resources"
-      APP_ENV: testing
-      APP_KEY: base64:7aYe15aBsSh6a2ScVwj1JfYjQKUmz9Z5X/GSe64joHA=
-      APP_DEBUG: 'true'
-      APP_TIMEZONE: UTC
-      APP_URL: http://localhost
-      DB_CONNECTION: mysql
-      DB_HOST: 127.0.0.1
-      DB_PORT: 3306
-      DB_DATABASE: testing
-      DB_USERNAME: root
-      DB_PASSWORD: password
-
+          
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up PHP
+      - name: Set up PHP & Composer
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.3
           extensions: mbstring, pdo, mysql, bcmath, tokenizer
+          tools: composer
 
-      - name: Restore Composer cache
-        uses: actions/cache@v3
-        with:
-          path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('composer.lock') }}
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --prefer-dist
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 20
 
-      - name: Restore node modules cache
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
+      - name: Install NPM dependencies
+        run: npm ci
 
-      - name: Restore Vite build cache
-        uses: actions/cache@v3
-        with:
-          path: public/build
-          key: ${{ runner.os }}-vite-${{ hashFiles('package-lock.json', 'vite.config.js') }}
+      - name: Build assets
+        run: npm run build
 
       - name: Wait for MySQL to be ready
         run: |
@@ -141,44 +143,5 @@ jobs:
       - name: Run database migrations
         run: php artisan migrate --force
 
-  run-tests:
-    runs-on: ubuntu-latest
-    needs: test-setup
-    env:
-      APP_NAME: "Computer Science Resources"
-      APP_ENV: testing
-      APP_KEY: base64:7aYe15aBsSh6a2ScVwj1JfYjQKUmz9Z5X/GSe64joHA=
-      APP_DEBUG: 'true'
-      APP_TIMEZONE: UTC
-      APP_URL: http://localhost
-      DB_CONNECTION: mysql
-      DB_HOST: 127.0.0.1
-      DB_PORT: 3306
-      DB_DATABASE: testing
-      DB_USERNAME: root
-      DB_PASSWORD: password
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.3
-          extensions: mbstring, pdo, mysql, bcmath, tokenizer
-
-      - name: Restore Composer cache
-        uses: actions/cache@v3
-        with:
-          path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('composer.lock') }}
-
-      - name: Restore Vite build cache
-        uses: actions/cache@v3
-        with:
-          path: public/build
-          key: ${{ runner.os }}-vite-${{ hashFiles('package-lock.json', 'vite.config.js') }}
-
-      - name: Run Laravel tests
+      - name: Run feature & unit tests
         run: php artisan test