diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 7805bf4a1e..0c42ccc802 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.PS_VERSION_START }}-${{ matrix.PHP_VERSION }} + PS_DOCKER: ${{ matrix.IMG_DOCKER }} steps: - name: Checkout uses: actions/checkout@v4 @@ -51,7 +51,7 @@ jobs: PS_VERSION: ${{ env.PS_DOCKER }} run: | docker compose -f "docker-compose.yml" up -d --build - bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost/en/)" != "200" ]]; do sleep 5; done' + bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost/)" != "200" ]]; do sleep 5; done' - name: Composer install run: composer install @@ -64,7 +64,7 @@ jobs: - name: Upgrade run: | docker exec -t prestashop php modules/autoupgrade/cli-upgrade.php --dir=admin-dev --channel=${{ matrix.UPGRADE_CHANNEL }} - docker exec -t prestashop chmod 777 -R /var/www/html/var/cache/dev + docker exec -t prestashop chmod 777 -R /var/www/html/var/cache/ - name: Install dependencies working-directory: tests/UI/ diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index bd2f6d8e93..aa89265aff 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,7 +1,27 @@ { "include": [ { - "comment": "1.7.8 ~ minor PHP 7.4" + "comment": "1.7.5 ~ major PHP 7.2" + }, + { + "PS_VERSION_START": "1.7.5.0", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.5.0" + }, + { + "PS_VERSION_START": "1.7.5.1", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.5.1" + }, + { + "comment": "@todo 1.7.5.2" + }, + { + "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" }, { "PS_VERSION_START": "1.7.8.10", diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index 8cbdd804df..b6c3a35b53 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}-apache + image: prestashop/prestashop:${PS_VERSION} container_name: prestashop depends_on: - mysql