From c596f5972bb2309911877284dbd0855d3d19f331 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 12 Mar 2026 10:09:54 +0100 Subject: [PATCH 01/11] [TMP] Run regression --- dependencies.json | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 00000000..8116815f --- /dev/null +++ b/dependencies.json @@ -0,0 +1,77 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-IBX-11236-use-ds-btn-component as dev-5.0-next", + "repositoryUrl": "git@github.com:ibexa/admin-ui-assets.git", + "package": "ibexa/admin-ui-assets", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/corporate-account", + "package": "ibexa/corporate-account", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/admin-ui", + "package": "ibexa/admin-ui", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/connector-ai", + "package": "ibexa/connector-ai", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/discounts", + "package": "ibexa/discounts", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/payment", + "package": "ibexa/payment", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/personalization", + "package": "ibexa/personalization", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog", + "package": "ibexa/product-catalog", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/scheduler", + "package": "ibexa/scheduler", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/shipping", + "package": "ibexa/shipping", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/workflow", + "package": "ibexa/workflow", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/design-system-twig", + "package": "ibexa/design-system-twig", + "shouldBeAddedAsVCS": false + } + ] +} \ No newline at end of file From f84ca3eba87ad6639a68426aeac1b0322ce0806b Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 12 Mar 2026 10:43:43 +0100 Subject: [PATCH 02/11] repositories - DST --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index ab069ca1..44938b54 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,10 @@ { "type": "composer", "url": "https://updates.ibexa.co" + }, + { + "type": "vcs", + "url": "https://github.com/ibexa/design-system-twig" } ], "require": { From 53fb9d1e6cc5b362bee900c3c301e0d00444ee1b Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 16 Mar 2026 12:28:15 +0100 Subject: [PATCH 03/11] rem vcs form composer --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 44938b54..ab069ca1 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,6 @@ { "type": "composer", "url": "https://updates.ibexa.co" - }, - { - "type": "vcs", - "url": "https://github.com/ibexa/design-system-twig" } ], "require": { From 787b48f10a4924c8599e9234761b5b4a048c2c30 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi Date: Wed, 25 Mar 2026 09:12:48 +0100 Subject: [PATCH 04/11] 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 7015633fb7f24ff453126a64ee7e135287ac37a4 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 2 Apr 2026 16:28:44 +0200 Subject: [PATCH 05/11] test --- dependencies.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dependencies.json b/dependencies.json index 8116815f..5e77ed31 100644 --- a/dependencies.json +++ b/dependencies.json @@ -11,7 +11,7 @@ "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/corporate-account", "package": "ibexa/corporate-account", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", @@ -23,55 +23,55 @@ "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/connector-ai", "package": "ibexa/connector-ai", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/discounts", "package": "ibexa/discounts", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/payment", "package": "ibexa/payment", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/personalization", "package": "ibexa/personalization", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/product-catalog", "package": "ibexa/product-catalog", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/scheduler", "package": "ibexa/scheduler", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/shipping", "package": "ibexa/shipping", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/workflow", "package": "ibexa/workflow", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/design-system-twig", "package": "ibexa/design-system-twig", - "shouldBeAddedAsVCS": false + "shouldBeAddedAsVCS": true } ] } \ No newline at end of file From 3e462529f46ba279cd558ee9e1920e0a0d2c8570 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 3 Apr 2026 11:45:58 +0200 Subject: [PATCH 06/11] test --- dependencies.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dependencies.json b/dependencies.json index 5e77ed31..aa35463a 100644 --- a/dependencies.json +++ b/dependencies.json @@ -43,12 +43,6 @@ "package": "ibexa/personalization", "shouldBeAddedAsVCS": false }, - { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", - "repositoryUrl": "https://github.com/ibexa/product-catalog", - "package": "ibexa/product-catalog", - "shouldBeAddedAsVCS": false - }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/scheduler", From 7ee846291e52ba91d44976fa307b20bc6601e72d Mon Sep 17 00:00:00 2001 From: katarzynazawada Date: Wed, 15 Apr 2026 08:58:21 +0200 Subject: [PATCH 07/11] Added p-c --- dependencies.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dependencies.json b/dependencies.json index aa35463a..5e77ed31 100644 --- a/dependencies.json +++ b/dependencies.json @@ -43,6 +43,12 @@ "package": "ibexa/personalization", "shouldBeAddedAsVCS": false }, + { + "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog", + "package": "ibexa/product-catalog", + "shouldBeAddedAsVCS": false + }, { "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", "repositoryUrl": "https://github.com/ibexa/scheduler", From f096d648000a65aa94440ba47a0f52037488f717 Mon Sep 17 00:00:00 2001 From: katarzynazawada Date: Wed, 15 Apr 2026 09:38:22 +0200 Subject: [PATCH 08/11] Trigger new build From 580d1a24b9be5057a751d227f4d93c3abadcaeb6 Mon Sep 17 00:00:00 2001 From: katarzynazawada Date: Wed, 15 Apr 2026 10:37:45 +0200 Subject: [PATCH 09/11] Trigger new build From fd76280197712a16b30dddf3d5431d01a4d09d1d Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 16 Apr 2026 11:39:29 +0200 Subject: [PATCH 10/11] use proper tag branch from admin-ui-assets --- dependencies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.json b/dependencies.json index 5e77ed31..b406b0f4 100644 --- a/dependencies.json +++ b/dependencies.json @@ -2,7 +2,7 @@ "recipesEndpoint": "", "packages": [ { - "requirement": "dev-IBX-11236-use-ds-btn-component as dev-5.0-next", + "requirement": "dev-IBX-11416-tag-ds as dev-5.0-next", "repositoryUrl": "git@github.com:ibexa/admin-ui-assets.git", "package": "ibexa/admin-ui-assets", "shouldBeAddedAsVCS": false From 27b6826aa20aa217d436c42af0069c03f562e3f7 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 1 Jun 2026 09:45:07 +0200 Subject: [PATCH 11/11] update to 6.0 --- dependencies.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dependencies.json b/dependencies.json index b406b0f4..fbd89eba 100644 --- a/dependencies.json +++ b/dependencies.json @@ -2,73 +2,73 @@ "recipesEndpoint": "", "packages": [ { - "requirement": "dev-IBX-11416-tag-ds as dev-5.0-next", + "requirement": "dev-IBX-11416-tag-ds as dev-6.0-next", "repositoryUrl": "git@github.com:ibexa/admin-ui-assets.git", "package": "ibexa/admin-ui-assets", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/corporate-account", "package": "ibexa/corporate-account", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/admin-ui", "package": "ibexa/admin-ui", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/connector-ai", "package": "ibexa/connector-ai", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/discounts", "package": "ibexa/discounts", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/payment", "package": "ibexa/payment", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/personalization", "package": "ibexa/personalization", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/product-catalog", "package": "ibexa/product-catalog", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/scheduler", "package": "ibexa/scheduler", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/shipping", "package": "ibexa/shipping", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/workflow", "package": "ibexa/workflow", "shouldBeAddedAsVCS": false }, { - "requirement": "dev-IBX-11416-tag-ds as 5.0.x-dev", + "requirement": "dev-IBX-11416-tag-ds as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/design-system-twig", "package": "ibexa/design-system-twig", "shouldBeAddedAsVCS": true