From daa79f19268df90a9ab3a0dc3a9d18731db0cba4 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Mon, 15 Jul 2024 15:35:31 +0200 Subject: [PATCH 1/2] Add the upgrade of 178 to major in pho 7.2 ~ 7.4 --- .github/workflows/ui-test/nightly.json | 246 ++++++++++++++++++++++++- .github/workflows/ui-test/sanity.json | 8 +- 2 files changed, 247 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ui-test/nightly.json b/.github/workflows/ui-test/nightly.json index be13569c7..9d450943e 100644 --- a/.github/workflows/ui-test/nightly.json +++ b/.github/workflows/ui-test/nightly.json @@ -31,13 +31,13 @@ "PS_VERSION_START": "1.7.8.1", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.4" + "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.8.1", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.3" + "PHP_VERSION": "7.4" }, { "PS_VERSION_START": "1.7.8.2", @@ -49,12 +49,24 @@ "PS_VERSION_START": "1.7.8.2", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.4" + "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.8.2", "PS_VERSION_END": "1.7.8.11", "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.3", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.3", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", "PHP_VERSION": "7.3" }, { @@ -192,6 +204,234 @@ { "comment": "1.7.8 ~ major PHP 7.2 ~ 7.4" }, + { + "PS_VERSION_START": "1.7.8.0", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.0", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.0", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.1", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.1", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.1", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.2", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.2", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.2", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.3", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.3", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.3", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.4", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.4", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.4", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.4", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.4", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.4", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.5", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.5", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.5", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.6", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.6", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.6", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.7", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.7", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.7", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.8", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.8", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.8", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.9", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.9", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.9", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.10", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.10", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.8.10", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.4" + }, + { + "PS_VERSION_START": "1.7.8.11", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.8.11", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.3" + }, { "PS_VERSION_START": "1.7.8.11", "PS_VERSION_END": "8.1.7", diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 8bf62103d..bd2f6d8e9 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,7 +1,7 @@ { "include": [ { - "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" + "comment": "1.7.8 ~ minor PHP 7.4" }, { "PS_VERSION_START": "1.7.8.10", @@ -10,7 +10,7 @@ "PHP_VERSION": "7.4" }, { - "comment": "1.7.8 ~ major PHP 7.2 ~ 7.4" + "comment": "1.7.8 ~ major PHP 7.4" }, { "PS_VERSION_START": "1.7.8.11", @@ -19,7 +19,7 @@ "PHP_VERSION": "7.4" }, { - "comment": "8.0.5 ~ minor PHP 7.2 ~ 8.1" + "comment": "8.0.5 ~ minor PHP 8.1" }, { "PS_VERSION_START": "8.0.5", @@ -28,7 +28,7 @@ "PHP_VERSION": "8.1" }, { - "comment": "8.1.6 ~ minor PHP 7.2 ~ 8.1" + "comment": "8.1.6 ~ minor PHP 8.1" }, { "PS_VERSION_START": "8.1.6", From 5a04a3ab1a0de8c3f38fcc094e9cc15734811085 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Mon, 15 Jul 2024 16:36:43 +0200 Subject: [PATCH 2/2] Update package-lock --- tests/UI/package-lock.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json index 24d11d32d..ce0a7e8d6 100644 --- a/tests/UI/package-lock.json +++ b/tests/UI/package-lock.json @@ -495,7 +495,7 @@ }, "node_modules/@prestashop-core/ui-testing": { "version": "0.0.12", - "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#3782a908cd8f42cebd7f7a47b5b8a9d7f0be0a20", + "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#f1da7249d61570f2d7aebf45d486782a65db9db6", "license": "MIT", "dependencies": { "@faker-js/faker": "^8.3.1", @@ -504,6 +504,7 @@ "@xmldom/xmldom": "^0.8.10", "csv-writer": "^1.6.0", "fast-xml-parser": "^4.4.0", + "gunzip-file": "^0.1.1", "jpeg-js": "^0.4.4", "js-image-generator": "^1.0.4", "libsodium-wrappers": "^0.7.13", @@ -3264,6 +3265,11 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "node_modules/gunzip-file": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/gunzip-file/-/gunzip-file-0.1.1.tgz", + "integrity": "sha512-DjDExBKHuhyhHOs8HeGV5dw6wY6eYTl4pAHz27oy8XppgBK60vmG/G3bY09zyT9PXX4TjmnEF4hYoRn61Fctlg==" + }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -6675,7 +6681,7 @@ } }, "@prestashop-core/ui-testing": { - "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#3782a908cd8f42cebd7f7a47b5b8a9d7f0be0a20", + "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#f1da7249d61570f2d7aebf45d486782a65db9db6", "from": "@prestashop-core/ui-testing@https://github.com/PrestaShop/ui-testing-library#main", "requires": { "@faker-js/faker": "^8.3.1", @@ -6684,6 +6690,7 @@ "@xmldom/xmldom": "^0.8.10", "csv-writer": "^1.6.0", "fast-xml-parser": "^4.4.0", + "gunzip-file": "^0.1.1", "jpeg-js": "^0.4.4", "js-image-generator": "^1.0.4", "libsodium-wrappers": "^0.7.13", @@ -8703,6 +8710,11 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "gunzip-file": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/gunzip-file/-/gunzip-file-0.1.1.tgz", + "integrity": "sha512-DjDExBKHuhyhHOs8HeGV5dw6wY6eYTl4pAHz27oy8XppgBK60vmG/G3bY09zyT9PXX4TjmnEF4hYoRn61Fctlg==" + }, "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",