From 3f42229ee30392f5a2114cbeb486c7ebf68cc294 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Tue, 9 Jul 2024 22:20:14 +0200 Subject: [PATCH] Add some fixes --- .github/workflows/ui-test.yml | 2 +- .github/workflows/ui-test/sanity.json | 72 ++++++++++++++++++--------- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 73d4ef1e4..a52573883 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -37,7 +37,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 }} outputs: matrix: ${{ needs.ui_test_matrix.outputs.matrix }} steps: diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index b0bd55611..2652dda02 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -7,121 +7,141 @@ "PS_VERSION_START": "1.7.6.0", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.0" }, { "PS_VERSION_START": "1.7.6.0", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.0" }, { "PS_VERSION_START": "1.7.6.1", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.1" }, { "PS_VERSION_START": "1.7.6.1", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.1" }, { "PS_VERSION_START": "1.7.6.2", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.1" }, { "PS_VERSION_START": "1.7.6.2", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.2" }, { "PS_VERSION_START": "1.7.6.3", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.3" }, { "PS_VERSION_START": "1.7.6.3", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.3" }, { "PS_VERSION_START": "1.7.6.4", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.4" }, { "PS_VERSION_START": "1.7.6.4", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.4" }, { "PS_VERSION_START": "1.7.6.5", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.5" }, { "PS_VERSION_START": "1.7.6.5", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.5" }, { "PS_VERSION_START": "1.7.6.6", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.6" }, { "PS_VERSION_START": "1.7.6.6", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.6" }, { "PS_VERSION_START": "1.7.6.7", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.7" }, { "PS_VERSION_START": "1.7.6.7", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.7" }, { "PS_VERSION_START": "1.7.6.8", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.8" }, { "PS_VERSION_START": "1.7.6.8", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.8" }, { "PS_VERSION_START": "1.7.6.9", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.6.9" }, { "PS_VERSION_START": "1.7.6.9", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.6.9" }, { "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" @@ -130,7 +150,8 @@ "PS_VERSION_START": "1.7.8.10", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.4" + "PHP_VERSION": "7.4", + "IMG_DOCKER": "1.7.8.10-7.4-apache" }, { "comment": "1.7.8 ~ major PHP 7.2 ~ 7.4" @@ -139,7 +160,8 @@ "PS_VERSION_START": "1.7.8.11", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "major", - "PHP_VERSION": "7.4" + "PHP_VERSION": "7.4", + "IMG_DOCKER": "1.7.8.11-7.4-apache" }, { "comment": "8.0.5 ~ minor PHP 7.2 ~ 8.1" @@ -148,7 +170,8 @@ "PS_VERSION_START": "8.0.5", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "8.1" + "PHP_VERSION": "8.1", + "IMG_DOCKER": "8.0.5-8.1-apache" }, { "comment": "8.1.6 ~ minor PHP 7.2 ~ 8.1" @@ -157,7 +180,8 @@ "PS_VERSION_START": "8.1.6", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "8.1" + "PHP_VERSION": "8.1", + "IMG_DOCKER": "8.1.6-8.1-apache" } ] } \ No newline at end of file