From 9e2d13e77626410aaa76166a3030aa15a8e4edc5 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Thu, 18 Jul 2024 10:39:32 +0200 Subject: [PATCH] Use mysql 5.7 --- .github/workflows/ui-test/sanity.json | 16 +++++----------- tests/UI/docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 58f88882a..8f67434f2 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,43 +1,37 @@ { "include": [ { - "comment": "1.7.8 ~ minor PHP 7.4" "comment": "1.7.3 ~ minor PHP 7.1" }, { "PS_VERSION_START": "1.7.3.0", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.3.0" + "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.3.1", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.3.1" + "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.3.2", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.3.2" + "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.3.3", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.3.3" + "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.3.4", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.3.4" + "PHP_VERSION": "7.1" }, { "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index b6c3a35b5..8cbdd804d 100644 --- 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