From d87dfb470ed31b7c948aaf4dabba9300111cb88b Mon Sep 17 00:00:00 2001 From: Aurelien Rita Date: Tue, 3 Dec 2024 15:56:03 +0100 Subject: [PATCH 1/3] Add v9 to sanity to check if we can do an upgrade to it --- .github/workflows/ui-test.yml | 14 +++++++------- .github/workflows/ui-test/sanity.json | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 68ae70d92..7de51507e 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -71,14 +71,14 @@ jobs: run: | docker exec -t prestashop curl --fail -L https://github.com/PrestaShop/zip-archives/raw/main/prestashop_${{ matrix.PS_VERSION_END }}.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip docker exec -t prestashop curl --fail -L https://api.prestashop.com/xml/md5/${{ matrix.PS_VERSION_END }}.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml - - - name: Download local ZIP and XML for local channel in 9.0.0 - if: matrix.PS_VERSION_END == '9.0.0' - run: | - docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly_9.0.x.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip - docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly_9.0.x.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml - - name: Write configuration file + + - name: Download local ZIP and XML for local channel in 9.1.x + if: matrix.PS_VERSION_END == '9.1.0' + run: | + docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip + docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml + run: | docker exec -t prestashop sh -c "echo '{ \"channel\":\"${{ matrix.UPGRADE_CHANNEL }}\", diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 1b45407b8..c01896ed0 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -107,6 +107,12 @@ "PS_VERSION_END": "9.0.0", "PHP_VERSION": "8.1", "UPGRADE_CHANNEL": "local" + }, + { + "PS_VERSION_START": "8.1.7", + "PS_VERSION_END": "9.1.0", + "PHP_VERSION": "8.1", + "UPGRADE_CHANNEL": "local" } ] } From 3e8c5600709492f945f5ae44fe7ffd859c7a61d1 Mon Sep 17 00:00:00 2001 From: Aurelien Rita Date: Tue, 3 Dec 2024 16:42:19 +0100 Subject: [PATCH 2/3] Undo the delete of V9 --- .github/workflows/ui-test.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 7de51507e..11abd7a7e 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -71,14 +71,20 @@ jobs: run: | docker exec -t prestashop curl --fail -L https://github.com/PrestaShop/zip-archives/raw/main/prestashop_${{ matrix.PS_VERSION_END }}.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip docker exec -t prestashop curl --fail -L https://api.prestashop.com/xml/md5/${{ matrix.PS_VERSION_END }}.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml + + - name: Download local ZIP and XML for local channel in 9.0.0 + if: matrix.PS_VERSION_END == '9.0.0' + run: | + docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly_9.0.x.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip + docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly_9.0.x.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml + + - name: Download local ZIP and XML for local channel in 9.1.0 + if: matrix.PS_VERSION_END == '9.1.0' + run: | + docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip + docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml + - name: Write configuration file - - - name: Download local ZIP and XML for local channel in 9.1.x - if: matrix.PS_VERSION_END == '9.1.0' - run: | - docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip - docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml - run: | docker exec -t prestashop sh -c "echo '{ \"channel\":\"${{ matrix.UPGRADE_CHANNEL }}\", From de81028f55b16a7a8a256b123e4b27b9f4d00c11 Mon Sep 17 00:00:00 2001 From: Aurelien Rita Date: Tue, 3 Dec 2024 16:51:43 +0100 Subject: [PATCH 3/3] Add the condition for the v9.1 --- .github/workflows/ui-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 11abd7a7e..58ed7e2d9 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -67,7 +67,7 @@ jobs: docker exec -t prestashop php modules/autoupgrade/bin/console backup:create admin-dev - name: Download local ZIP and XML for local channel - if: matrix.UPGRADE_CHANNEL == 'local' && matrix.PS_VERSION_END != '9.0.0' + if: matrix.UPGRADE_CHANNEL == 'local' && matrix.PS_VERSION_END != '9.0.0' && matrix.PS_VERSION_END != '9.1.0' run: | docker exec -t prestashop curl --fail -L https://github.com/PrestaShop/zip-archives/raw/main/prestashop_${{ matrix.PS_VERSION_END }}.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip docker exec -t prestashop curl --fail -L https://api.prestashop.com/xml/md5/${{ matrix.PS_VERSION_END }}.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml