Add some fixes

PrestaShop · Jul 18, 2024 · 735dc51 · 735dc51
1 parent 6b71417
commit 735dc51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git 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
@@ -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"