From c994b8931015b99e8a9b5dcdcae8c4af592aadd1 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Thu, 10 Oct 2024 06:58:53 +0200
Subject: [PATCH] Revert "[CI] Use default env in MySQL workflow"

---
 .github/workflows/ci_e2e-mysql.yaml | 13 ++++++-------
 .github/workflows/matrix.json       |  7 +++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci_e2e-mysql.yaml b/.github/workflows/ci_e2e-mysql.yaml
index 023462c3b7..6b8ae5cebd 100644
--- a/.github/workflows/ci_e2e-mysql.yaml
+++ b/.github/workflows/ci_e2e-mysql.yaml
@@ -23,7 +23,6 @@ jobs:
         name: "Get matrix"
         outputs:
             matrix: ${{ steps.matrix.outputs.prop }}
-            env: ${{ matrix.env || 'test_cached' }}
         steps:
             -   name: "Checkout (With Branch)"
                 if: "${{ inputs.branch != '' }}"
@@ -45,14 +44,14 @@ jobs:
     behat-no-js:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
+        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ matrix.env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
             matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }}
 
         env:
-            APP_ENV: ${{ env }}
+            APP_ENV: ${{ matrix.env }}
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?charset=utf8mb4&serverVersion=${{ matrix.mysql }}"
 
         steps:
@@ -133,14 +132,14 @@ jobs:
     behat-ui-js-chromedriver:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "JS with Chromedriver, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
+        name: "JS with Chromedriver, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ matrix.env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
             matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }}
 
         env:
-            APP_ENV: ${{ env }}
+            APP_ENV: ${{ matrix.env }}
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?charset=utf8mb4&serverVersion=${{ matrix.mysql }}"
 
         steps:
@@ -211,14 +210,14 @@ jobs:
     behat-ui-js-panther:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "JS with Panther, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
+        name: "JS with Panther, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ matrix.env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
             matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }}
 
         env:
-            APP_ENV: ${{ env }}
+            APP_ENV: ${{ matrix.env }}
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?charset=utf8mb4&serverVersion=${{ matrix.mysql }}"
 
         steps:
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
index cfe0b08b9f..9e57d8c853 100644
--- a/.github/workflows/matrix.json
+++ b/.github/workflows/matrix.json
@@ -39,14 +39,16 @@
           "symfony": "^6.4",
           "api-platform": "^3.3",
           "mysql": "8.0",
-          "twig": "^3.3"
+          "twig": "^3.3",
+          "env": "test_cached"
         },
         {
           "php": "8.3",
           "symfony": "^7.1",
           "api-platform": "^3.3",
           "mysql": "8.4",
-          "twig": "^3.3"
+          "twig": "^3.3",
+          "env": "test_cached"
         },
         {
           "php": "8.3",
@@ -110,6 +112,7 @@
       "api-platform": ["^3.3"],
       "mysql": ["8.0", "8.4"],
       "twig": ["^3.3"],
+      "env": "test_cached",
       "include": [
         {
           "php": "8.3",