From a8b6fe9b45317cba4d56ee15dc78388fb6141207 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Tue, 19 May 2026 11:47:37 +0200 Subject: [PATCH 1/6] [TMP] Run regression --- dependencies.json | 125 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 00000000..044e6e8e --- /dev/null +++ b/dependencies.json @@ -0,0 +1,125 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/integrated-help", + "package": "ibexa/integrated-help", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/activity-log", + "package": "ibexa/activity-log", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/version-comparison", + "package": "ibexa/version-comparison", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/taxonomy", + "package": "ibexa/taxonomy", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/site-factory", + "package": "ibexa/site-factory", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/site-context", + "package": "ibexa/site-context", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog", + "package": "ibexa/product-catalog", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/order-management", + "package": "ibexa/order-management", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/page-builder", + "package": "ibexa/page-builder", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/image-picker", + "package": "ibexa/image-picker", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/image-editor", + "package": "ibexa/image-editor", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/form-builder", + "package": "ibexa/form-builder", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/fieldtype-richtext", + "package": "ibexa/fieldtype-richtext", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/fieldtype-page", + "package": "ibexa/fieldtype-page", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/dashboard", + "package": "ibexa/dashboard", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/content-tree", + "package": "ibexa/content-tree", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/connector-ai", + "package": "ibexa/connector-ai", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/calendar", + "package": "ibexa/calendar", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/app-switcher", + "package": "ibexa/app-switcher", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/admin-ui", + "package": "ibexa/admin-ui", + "shouldBeAddedAsVCS": false + } + ] +} \ No newline at end of file From 5f33ba9454f6d9a54842715ba821c7ae13859b97 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi Date: Wed, 25 Mar 2026 09:12:48 +0100 Subject: [PATCH 2/6] Switch to private non-skip-dev Satis server for CI tests --- .github/workflows/browser-tests.yml | 9 +++++--- composer.json | 33 +++++++++++++++++------------ 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index eda354ab..f51a8fa9 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-commerce-setup1: name: "PHP 8.3/Node 22/PostgreSQL 18.0/Varnish/Redis 7.2/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -29,6 +29,7 @@ jobs: test-setup-phase-1: "--profile=regression --suite=setup-commerce --tags=~@part2 --mode=standard" test-setup-phase-2: "--profile=regression --suite=setup-commerce --tags=@part2 --mode=standard" setup: "doc/docker/base-dev.yml:doc/docker/db-postgresql18.yml:doc/docker/varnish.yml:doc/docker/redis7.2.yml:doc/docker/selenium.yml" + ci-scripts-branch: "k8s-satis" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true @@ -37,7 +38,7 @@ jobs: secrets: inherit regression-commerce-setup2: name: "PHP 8.4/Node 22/MariaDB 11.4/Elastic 8/Valkey latest" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -45,6 +46,7 @@ jobs: test-setup-phase-1: "--profile=regression --suite=setup-commerce --tags=~@part2 --mode=standard" test-setup-phase-2: "--profile=regression --suite=setup-commerce --tags=@part2 --mode=standard" setup: "doc/docker/base-dev.yml:doc/docker/db-mariadb11.4.yml:doc/docker/elastic8.yml:doc/docker/valkey-latest.yml:doc/docker/selenium.yml" + ci-scripts-branch: "k8s-satis" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true @@ -53,7 +55,7 @@ jobs: secrets: inherit regression-commerce-setup3: name: "PHP 8.4/Node 22/MySQL 8.4/Multirepository/Solr 8/Redis latest" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -61,6 +63,7 @@ jobs: test-setup-phase-1: "--profile=regression --suite=setup-commerce --tags=~@part2 --mode=standard" test-setup-phase-2: "--profile=regression --suite=setup-commerce --tags=@part2 --mode=standard" setup: "doc/docker/base-dev.yml:doc/docker/db-mysql8.4.yml:doc/docker/solr8.yml:doc/docker/redis-latest.yml:doc/docker/selenium.yml" + ci-scripts-branch: "k8s-satis" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true diff --git a/composer.json b/composer.json index ab069ca1..086cb85b 100644 --- a/composer.json +++ b/composer.json @@ -8,26 +8,33 @@ "repositories": [ { "type": "composer", - "url": "https://updates.ibexa.co" + "url": "https://satis.services.ibexa.co" } ], "require": { "php": ">=8.3", - "ibexa/experience": "~6.0.x-dev", - "ibexa/cart": "~6.0.x-dev", - "ibexa/checkout": "~6.0.x-dev", - "ibexa/corporate-account-commerce-bridge": "~6.0.x-dev", - "ibexa/discounts": "~6.0.x-dev", - "ibexa/discounts-codes": "~6.0.x-dev", - "ibexa/storefront": "~6.0.x-dev", - "ibexa/order-management": "~6.0.x-dev", - "ibexa/payment": "~6.0.x-dev", - "ibexa/shipping": "~6.0.x-dev", - "ibexa/connector-payum": "~6.0.x-dev" + "ibexa/experience": "~5.0.x-dev", + "ibexa/cart": "~5.0.x-dev", + "ibexa/checkout": "~5.0.x-dev", + "ibexa/corporate-account-commerce-bridge": "~5.0.x-dev", + "ibexa/discounts": "~5.0.x-dev", + "ibexa/discounts-codes": "~5.0.x-dev", + "ibexa/storefront": "~5.0.x-dev", + "ibexa/order-management": "~5.0.x-dev", + "ibexa/payment": "~5.0.x-dev", + "ibexa/shipping": "~5.0.x-dev", + "ibexa/connector-payum": "~5.0.x-dev" }, "extra": { "branch-alias": { - "dev-master": "6.0.x-dev" + "dev-master": "5.0.x-dev" + } + }, + "config": { + "allow-plugins": { + "php-http/discovery": true, + "symfony/flex": true, + "ibexa/post-install": true } } } From 87c5a51649cf640306534cd6655bf886e7c4fb31 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Tue, 19 May 2026 15:27:09 +0200 Subject: [PATCH 3/6] More dependencies.json --- dependencies.json | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/dependencies.json b/dependencies.json index 044e6e8e..4d2854ac 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,47 +1,53 @@ { "recipesEndpoint": "", "packages": [ + { + "requirement": "dev-IBX-11695-use-ds-palette as dev-6.0-next", + "repositoryUrl": "https://github.com/ibexa/admin-ui-assets.git", + "package": "ibexa/admin-ui-assets", + "shouldBeAddedAsVCS": false + }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", - "repositoryUrl": "https://github.com/ibexa/integrated-help", + "repositoryUrl": "git@github.com:ibexa/integrated-help", "package": "ibexa/integrated-help", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/activity-log", "package": "ibexa/activity-log", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/version-comparison", "package": "ibexa/version-comparison", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/taxonomy", "package": "ibexa/taxonomy", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/site-factory", "package": "ibexa/site-factory", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/site-context", "package": "ibexa/site-context", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/product-catalog", "package": "ibexa/product-catalog", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", @@ -53,25 +59,25 @@ "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/page-builder", "package": "ibexa/page-builder", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/image-picker", "package": "ibexa/image-picker", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/image-editor", "package": "ibexa/image-editor", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/form-builder", "package": "ibexa/form-builder", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", @@ -83,37 +89,37 @@ "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/fieldtype-page", "package": "ibexa/fieldtype-page", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/dashboard", "package": "ibexa/dashboard", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/content-tree", "package": "ibexa/content-tree", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/connector-ai", "package": "ibexa/connector-ai", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/calendar", "package": "ibexa/calendar", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/app-switcher", "package": "ibexa/app-switcher", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", From 62b1da011e2e7131ab5a5c129f4ffabd0dfdade6 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Tue, 19 May 2026 15:46:20 +0200 Subject: [PATCH 4/6] Changed shouldBeAddedAsVCS flag in dependencies.json --- dependencies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.json b/dependencies.json index 4d2854ac..e3d92ca6 100644 --- a/dependencies.json +++ b/dependencies.json @@ -53,7 +53,7 @@ "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/order-management", "package": "ibexa/order-management", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", From eea52c55f447958d7b0f12fb9627075e2acfe22d Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Tue, 19 May 2026 16:00:34 +0200 Subject: [PATCH 5/6] Fixed version in composer.json --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 086cb85b..f472471c 100644 --- a/composer.json +++ b/composer.json @@ -13,21 +13,21 @@ ], "require": { "php": ">=8.3", - "ibexa/experience": "~5.0.x-dev", - "ibexa/cart": "~5.0.x-dev", - "ibexa/checkout": "~5.0.x-dev", - "ibexa/corporate-account-commerce-bridge": "~5.0.x-dev", - "ibexa/discounts": "~5.0.x-dev", - "ibexa/discounts-codes": "~5.0.x-dev", - "ibexa/storefront": "~5.0.x-dev", - "ibexa/order-management": "~5.0.x-dev", - "ibexa/payment": "~5.0.x-dev", - "ibexa/shipping": "~5.0.x-dev", - "ibexa/connector-payum": "~5.0.x-dev" + "ibexa/experience": "~6.0.x-dev", + "ibexa/cart": "~6.0.x-dev", + "ibexa/checkout": "~6.0.x-dev", + "ibexa/corporate-account-commerce-bridge": "~6.0.x-dev", + "ibexa/discounts": "~6.0.x-dev", + "ibexa/discounts-codes": "~6.0.x-dev", + "ibexa/storefront": "~6.0.x-dev", + "ibexa/order-management": "~6.0.x-dev", + "ibexa/payment": "~6.0.x-dev", + "ibexa/shipping": "~6.0.x-dev", + "ibexa/connector-payum": "~6.0.x-dev" }, "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-master": "6.0.x-dev" } }, "config": { From a4a355eee621bc8f204a23267f829a826ca6b857 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Tue, 19 May 2026 16:15:35 +0200 Subject: [PATCH 6/6] Added package to dependencies.json --- dependencies.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dependencies.json b/dependencies.json index e3d92ca6..bd1a16e1 100644 --- a/dependencies.json +++ b/dependencies.json @@ -121,6 +121,12 @@ "package": "ibexa/app-switcher", "shouldBeAddedAsVCS": false }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/tree-builder", + "package": "ibexa/tree-builder", + "shouldBeAddedAsVCS": false + }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/admin-ui",