From 40264257230b4b5d0012f0650ddb423417a60540 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 30 Aug 2023 15:52:48 +0200 Subject: [PATCH 1/5] [TMP] Run regression --- dependencies.json | 131 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 00000000..059f0a3b --- /dev/null +++ b/dependencies.json @@ -0,0 +1,131 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/core", + "package": "ibexa/core", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/migrations", + "package": "ibexa/migrations", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/user", + "package": "ibexa/user", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/corporate-account", + "package": "ibexa/corporate-account", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog", + "package": "ibexa/product-catalog", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/workflow", + "package": "ibexa/workflow", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/version-comparison", + "package": "ibexa/version-comparison", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/shipping", + "package": "ibexa/shipping", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/page-builder", + "package": "ibexa/page-builder", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/order-management", + "package": "ibexa/order-management", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/fieldtype-address", + "package": "ibexa/fieldtype-address", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/checkout", + "package": "ibexa/checkout", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/taxonomy", + "package": "ibexa/taxonomy", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/image-editor", + "package": "ibexa/image-editor", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/content-tree", + "package": "ibexa/content-tree", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/site-factory", + "package": "ibexa/site-factory", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/fieldtype-matrix", + "package": "ibexa/fieldtype-matrix", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/payment", + "package": "ibexa/payment", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/scheduler", + "package": "ibexa/scheduler", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/system-info", + "package": "ibexa/system-info", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/admin-ui", + "package": "ibexa/admin-ui", + "shouldBeAddedAsVCS": false + } + ] +} \ No newline at end of file From 99a3a4e19255da81477b6b323e5498597860069c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 30 Aug 2023 16:07:22 +0200 Subject: [PATCH 2/5] Run single job --- .github/workflows/browser-tests.yml | 46 +---------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index dbb5f546..45785ac7 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -19,49 +19,6 @@ on: pull_request: ~ jobs: - regression-commerce-setup1: - name: "PHP 7.4/Node 14/PostgreSQL/Varnish/Redis/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main - with: - project-edition: "commerce" - project-version: ${{ github.event.inputs.project-version }} - test-suite: "--profile=regression --suite=commerce" - 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-postgresql.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" - send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} - job-count: 4 - multirepository: true - php-image: "ghcr.io/ibexa/docker/php:7.4-node14" - timeout: 120 - secrets: - SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} - SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - regression-commerce-setup2: - name: "PHP 8.0/Node 16/MySQL/Compatibility layer" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main - with: - project-edition: "commerce" - project-version: ${{ github.event.inputs.project-version }} - test-suite: "--profile=regression --suite=commerce" - 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/selenium.yml" - send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} - job-count: 4 - multirepository: true - php-image: "ghcr.io/ibexa/docker/php:8.0-node16" - timeout: 120 - secrets: - SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} - SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-commerce-setup3: name: "PHP 8.1/MySQL/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main @@ -73,8 +30,7 @@ jobs: test-setup-phase-2: "--profile=regression --suite=setup-commerce --tags=@part2 --mode=standard" setup: "doc/docker/base-dev.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} - job-count: 4 - multirepository: true + job-count: 1 php-image: "ghcr.io/ibexa/docker/php:8.1-node18" timeout: 120 secrets: From 6476a3b476c5bd2af80437d28f1e2dff79560562 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 10:27:14 +0200 Subject: [PATCH 3/5] Add segmentation PR --- dependencies.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dependencies.json b/dependencies.json index 059f0a3b..7d2fe32a 100644 --- a/dependencies.json +++ b/dependencies.json @@ -109,6 +109,12 @@ "package": "ibexa/payment", "shouldBeAddedAsVCS": true }, + { + "requirement": "dev-fix-translations as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/segmentation", + "package": "ibexa/segmentation", + "shouldBeAddedAsVCS": true + }, { "requirement": "dev-fix-translations as 4.6.x-dev", "repositoryUrl": "https://github.com/ibexa/scheduler", @@ -128,4 +134,4 @@ "shouldBeAddedAsVCS": false } ] -} \ No newline at end of file +} From 39870264757bdd6bce35bff0d6cd3394db96055b Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 13:47:31 +0200 Subject: [PATCH 4/5] remove system-info dependency --- dependencies.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dependencies.json b/dependencies.json index 7d2fe32a..eefee93c 100644 --- a/dependencies.json +++ b/dependencies.json @@ -121,12 +121,6 @@ "package": "ibexa/scheduler", "shouldBeAddedAsVCS": true }, - { - "requirement": "dev-fix-translations as 4.6.x-dev", - "repositoryUrl": "https://github.com/ibexa/system-info", - "package": "ibexa/system-info", - "shouldBeAddedAsVCS": false - }, { "requirement": "dev-fix-translations as 4.6.x-dev", "repositoryUrl": "https://github.com/ibexa/admin-ui", From 17b0fc516314c77b1119b9383ac4b20758817638 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 13:58:28 +0200 Subject: [PATCH 5/5] remove core and migrations --- dependencies.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dependencies.json b/dependencies.json index eefee93c..f01d7260 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,18 +1,6 @@ { "recipesEndpoint": "", "packages": [ - { - "requirement": "dev-fix-translations as 4.6.x-dev", - "repositoryUrl": "https://github.com/ibexa/core", - "package": "ibexa/core", - "shouldBeAddedAsVCS": false - }, - { - "requirement": "dev-fix-translations as 4.6.x-dev", - "repositoryUrl": "https://github.com/ibexa/migrations", - "package": "ibexa/migrations", - "shouldBeAddedAsVCS": true - }, { "requirement": "dev-fix-translations as 4.6.x-dev", "repositoryUrl": "https://github.com/ibexa/user",