From 735dc517b87c115fa9477cc744fe0fdfc7cf680a Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 18 Jul 2024 09:34:33 +0200
Subject: [PATCH] Add some fixes

---
 .github/workflows/ui-test.yml         |  2 +-
 .github/workflows/ui-test/sanity.json | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
index 0c42ccc802..6513903041 100644
--- a/.github/workflows/ui-test.yml
+++ b/.github/workflows/ui-test.yml
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJSON(needs.ui_test_matrix.outputs.matrix) }}
     env:
-      PS_DOCKER: ${{ matrix.IMG_DOCKER }}
+      PS_DOCKER: ${{ matrix.PS_VERSION_START }}-${{ matrix.PHP_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json
index 0337f7e784..d662547e15 100644
--- a/.github/workflows/ui-test/sanity.json
+++ b/.github/workflows/ui-test/sanity.json
@@ -7,43 +7,37 @@
       "PS_VERSION_START": "1.7.2.0",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.2.0"
+      "PHP_VERSION": "7.1"
     },
     {
       "PS_VERSION_START": "1.7.2.1",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.2.1"
+      "PHP_VERSION": "7.1"
     },
     {
       "PS_VERSION_START": "1.7.2.2",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.2.2"
+      "PHP_VERSION": "7.1"
     },
     {
       "PS_VERSION_START": "1.7.2.3",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.2.3"
+      "PHP_VERSION": "7.1"
     },
     {
       "PS_VERSION_START": "1.7.2.4",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.2.4"
+      "PHP_VERSION": "7.1"
     },
     {
       "PS_VERSION_START": "1.7.2.5",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.2.5"
+      "PHP_VERSION": "7.1"
     },
     {
       "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4"