Rebase

PrestaShop · Jul 16, 2024 · 0b5f532 · 0b5f532
1 parent fe7b508
commit 0b5f532
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 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
@@ -8,24 +8,20 @@
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
       "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.1.0"
     },
     {
       "PS_VERSION_START": "1.7.1.1",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
       "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.1.1"
     },
     {
       "PS_VERSION_START": "1.7.1.2",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
       "PHP_VERSION": "7.1",
-      "IMG_DOCKER": "1.7.1.2"
     },
     {
-      "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4"
       "comment": "1.7.8 ~ minor PHP 7.4"
     },
     {

diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   prestashop:
-    image: prestashop/prestashop:${PS_VERSION}
+    image: prestashop/prestashop:${PS_VERSION}-apache
     container_name: prestashop
     depends_on:
       - mysql