From e44794acec502275be1a652c446ced809609f72d Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Thu, 21 May 2026 11:34:27 +0200 Subject: [PATCH 1/4] [TMP] Run regression --- dependencies.json | 137 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 00000000..3f9cd7c3 --- /dev/null +++ b/dependencies.json @@ -0,0 +1,137 @@ +{ + "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/corporate-account", + "package": "ibexa/corporate-account", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/tree-builder", + "package": "ibexa/tree-builder", + "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 de28634386c54b1855251ec4773b0abbb7d81657 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi Date: Wed, 25 Mar 2026 09:12:48 +0100 Subject: [PATCH 2/4] Switch to private non-skip-dev Satis server for CI tests --- .github/workflows/browser-tests.yml | 9 ++++++--- composer.json | 2 +- 2 files changed, 7 insertions(+), 4 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..de5f8303 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "repositories": [ { "type": "composer", - "url": "https://updates.ibexa.co" + "url": "https://satis.services.ibexa.co" } ], "require": { From d7c5b9116b814816a137601a8daa9ce1828a32e7 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Thu, 21 May 2026 11:51:23 +0200 Subject: [PATCH 3/4] Stopped adding vcs config for Satis packages --- dependencies.json | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dependencies.json b/dependencies.json index 3f9cd7c3..9c5b925b 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,77 +1,83 @@ { "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", "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", "repositoryUrl": "https://github.com/ibexa/order-management", "package": "ibexa/order-management", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "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,49 +89,49 @@ "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", "repositoryUrl": "https://github.com/ibexa/corporate-account", "package": "ibexa/corporate-account", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/tree-builder", "package": "ibexa/tree-builder", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", From 7730982c3c390a5c4f29f2d2ca2d50c1189b8283 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Thu, 21 May 2026 13:21:43 +0200 Subject: [PATCH 4/4] Updated dependencies.json --- dependencies.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dependencies.json b/dependencies.json index 9c5b925b..c8e56bef 100644 --- a/dependencies.json +++ b/dependencies.json @@ -133,6 +133,12 @@ "package": "ibexa/tree-builder", "shouldBeAddedAsVCS": false }, + { + "requirement": "dev-IBX-11695 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/personalization", + "package": "ibexa/personalization", + "shouldBeAddedAsVCS": false + }, { "requirement": "dev-IBX-11695 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/admin-ui",