From 1c0e628b1b7dd3f6060958a9341ac19ac9d89207 Mon Sep 17 00:00:00 2001 From: Maciej Kobus Date: Wed, 17 May 2023 14:47:24 +0200 Subject: [PATCH 1/9] Renamed Content to Headless --- .github/pull_request_template.md | 4 ++-- README.md | 6 +++--- composer.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 62b29bb..75e090d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,8 @@ | Question | Answer | ---------------------------------------- | ------------------ -| **JIRA issue** | EZEE-XXXXX +| **JIRA issue** | IBX-XXXXX | **Type** | feature/bug/improvement -| **Target Ibexa version** | `v3.x` - please update `x` accordingly +| **Target Ibexa version** | `v4.6` - please update `x` accordingly | **BC breaks** | yes/no | **Doc needed** | yes/no diff --git a/README.md b/README.md index 61c2c27..7b9e469 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Ibexa DXP Content Symfony Flex metapackage +# Ibexa DXP Headless Symfony Flex metapackage -This is a metapackage for Symfony Flex-based Ibexa DXP Content installation. +This is a metapackage for Symfony Flex-based Ibexa DXP Headless installation. It requires a subscription. Learn more about [Ibexa DXP](https://www.ibexa.co/products). @@ -10,7 +10,7 @@ Learn more about [Ibexa DXP](https://www.ibexa.co/products). To install the latest version of Ibexa Content, follow the [installation guide](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform/). ## COPYRIGHT -Copyright (C) 1999-2020 Ibexa AS (formerly eZ Systems AS). All rights reserved. +Copyright (C) 1999-2023 Ibexa AS (formerly eZ Systems AS). All rights reserved. ## LICENSE This source code is available separately under the following licenses: diff --git a/composer.json b/composer.json index 294ab76..93ef8c0 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "ibexa/content", + "name": "ibexa/headless", "type": "metapackage", "license": "proprietary", - "description": "A meta package for installing Ibexa DXP Content edition", + "description": "A meta package for installing Ibexa DXP Headless edition", "minimum-stability": "dev", "prefer-stable": true, "repositories": [ From dcb8cbbf76104b29ec8573ae4483a4625ea9f9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 19 May 2023 14:15:36 +0200 Subject: [PATCH 2/9] Set up master branch to become 4.6 in the future --- composer.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 294ab76..e064a86 100644 --- a/composer.json +++ b/composer.json @@ -10,27 +10,27 @@ ], "require": { "php": "^7.4 || ^8.0", - "ibexa/oss": "~4.5.x-dev", - "ibexa/connect": "~4.5.x-dev", - "ibexa/measurement": "~4.5.x-dev", - "ibexa/migrations": "~4.5.x-dev", - "ibexa/image-editor": "~4.5.x-dev", - "ibexa/oauth2-client": "~4.5.x-dev", - "ibexa/installer": "~4.5.x-dev", - "ibexa/product-catalog": "~4.5.x-dev", - "ibexa/seo": "~4.5.x-dev", - "ibexa/scheduler": "~4.5.x-dev", - "ibexa/calendar": "~4.5.x-dev", - "ibexa/connector-dam": "~4.5.x-dev", - "ibexa/elasticsearch": "~4.5.x-dev", - "ibexa/fastly": "~4.5.x-dev", - "ibexa/icons": "~4.5.x-dev", - "ibexa/personalization": "~4.5.x-dev", - "ibexa/version-comparison": "~4.5.x-dev", - "ibexa/workflow": "~4.5.x-dev", - "ibexa/taxonomy": "~4.5.x-dev", - "ibexa/tree-builder": "~4.5.x-dev", - "ibexa/content-tree": "~4.5.x-dev", + "ibexa/oss": "~4.6.x-dev", + "ibexa/connect": "~4.6.x-dev", + "ibexa/measurement": "~4.6.x-dev", + "ibexa/migrations": "~4.6.x-dev", + "ibexa/image-editor": "~4.6.x-dev", + "ibexa/oauth2-client": "~4.6.x-dev", + "ibexa/installer": "~4.6.x-dev", + "ibexa/product-catalog": "~4.6.x-dev", + "ibexa/seo": "~4.6.x-dev", + "ibexa/scheduler": "~4.6.x-dev", + "ibexa/calendar": "~4.6.x-dev", + "ibexa/connector-dam": "~4.6.x-dev", + "ibexa/elasticsearch": "~4.6.x-dev", + "ibexa/fastly": "~4.6.x-dev", + "ibexa/icons": "~4.6.x-dev", + "ibexa/personalization": "~4.6.x-dev", + "ibexa/version-comparison": "~4.6.x-dev", + "ibexa/workflow": "~4.6.x-dev", + "ibexa/taxonomy": "~4.6.x-dev", + "ibexa/tree-builder": "~4.6.x-dev", + "ibexa/content-tree": "~4.6.x-dev", "gregwar/captcha-bundle": "^2.1" }, "require-dev": { @@ -38,7 +38,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.5.x-dev" + "dev-master": "4.6.x-dev" } } } From d945c295d969c9af44084c82b12be024c13641c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 6 Jun 2023 12:26:06 +0200 Subject: [PATCH 3/9] [Behat] IBX-5798: Ibexa Headless regression tests (#1) --- .github/workflows/browser-tests.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index eaf60ac..113f736 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -14,14 +14,14 @@ on: pull_request: ~ jobs: - regression-content-setup1: + regression-headless-setup1: name: "PHP 7.4/Node 14/PostgreSQL/Varnish/Redis/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: - project-edition: "content" - test-suite: "--profile=regression --suite=content" - test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard" - test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard" + project-edition: "headless" + test-suite: "--profile=regression --suite=headless" + test-setup-phase-1: "--profile=regression --suite=setup-headless --tags=~@part2 --mode=standard" + test-setup-phase-2: "--profile=regression --suite=setup-headless --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' }} multirepository: true @@ -36,14 +36,14 @@ jobs: AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - regression-content-setup2: + regression-headless-setup2: name: "PHP 8.1/Node 16/MySQL/Compatibility layer" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: - project-edition: "content" - test-suite: "--profile=regression --suite=content" - test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard" - test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard" + project-edition: "headless" + test-suite: "--profile=regression --suite=headless" + test-setup-phase-1: "--profile=regression --suite=setup-headless --tags=~@part2 --mode=standard" + test-setup-phase-2: "--profile=regression --suite=setup-headless --tags=@part2 --mode=standard" setup: "doc/docker/base-dev.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} use-compatibility-layer: true From 892f6edf93b253a47128eeab52ca5fb9e8f24251 Mon Sep 17 00:00:00 2001 From: Gunnstein Lye <289744+glye@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:52:55 +0200 Subject: [PATCH 4/9] Headless-ify README (#5) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b9e469..515604e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Learn more about [Ibexa DXP](https://www.ibexa.co/products). ## Installation -To install the latest version of Ibexa Content, follow the [installation guide](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform/). +To install the latest version of Ibexa Headless, follow the [installation guide](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform/). ## COPYRIGHT Copyright (C) 1999-2023 Ibexa AS (formerly eZ Systems AS). All rights reserved. From 0927d548d3ff46a9e15fff9a04de394dac0e0910 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:28:32 +0200 Subject: [PATCH 5/9] Updated Auto Tag workflow (#20) --- .github/workflows/auto_tag.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml index 17b4940..9daab07 100644 --- a/.github/workflows/auto_tag.yml +++ b/.github/workflows/auto_tag.yml @@ -20,7 +20,7 @@ on: jobs: preparation: runs-on: ubuntu-latest - # This should allow parallel runs in a chain, e.g. OSS->Content->Experience->Commerce + # This should allow parallel runs in a chain, e.g. OSS->Headless->Experience->Commerce # whilst allowing Satis to process timeout-minutes: 30 @@ -42,12 +42,12 @@ jobs: # select(.version == "${{ env.V_VERSION }}"): filters the array to only include objects where the version property is equal to the value of the environment variable V_VERSION. # No need to validate for oss version in satis - - name: Validate satis for content version + - name: Validate satis for headless version if: github.event.repository.name == 'experience' env: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - PARENT: ibexa/content + PARENT: ibexa/headless V_VERSION: v${{ inputs.version }} run: | for EXPONENTIAL_BACKOFF in {1..10}; do @@ -140,11 +140,11 @@ jobs: if: github.event.repository.name == 'oss' run: jq '.require["ibexa/admin-ui-assets"] |= "${{ inputs.version }}"' composer.json | sponge composer.json - name: Patch parent version for Content - if: github.event.repository.name == 'content' + if: github.event.repository.name == 'headless' run: jq '.require["ibexa/oss"] |= "${{ inputs.version }}"' composer.json | sponge composer.json - name: Patch parent version for Experience if: github.event.repository.name == 'experience' - run: jq '.require["ibexa/content"] |= "${{ inputs.version }}"' composer.json | sponge composer.json + run: jq '.require["ibexa/headless"] |= "${{ inputs.version }}"' composer.json | sponge composer.json - name: Patch parent version for Commerce if: github.event.repository.name == 'commerce' run: jq '.require["ibexa/experience"] |= "${{ inputs.version }}"' composer.json | sponge composer.json From c8519142be5847a6c9d54b3240450b5c8c40e040 Mon Sep 17 00:00:00 2001 From: Jakub Brzegowski Date: Tue, 21 Nov 2023 12:59:59 +0100 Subject: [PATCH 6/9] IBX-7098: Added ibexa/image-picker package (#29) --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 4847991..1ecb4f8 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "ibexa/taxonomy": "~4.6.x-dev", "ibexa/tree-builder": "~4.6.x-dev", "ibexa/content-tree": "~4.6.x-dev", + "ibexa/image-picker": "~4.6.x-dev", "gregwar/captcha-bundle": "^2.1" }, "require-dev": { From 0ee135183d01554e3a76464130a1ec5e503c9e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20W=C3=B3js?= Date: Thu, 23 Nov 2023 14:35:04 +0100 Subject: [PATCH 7/9] Added ibexa/site-context package (#32) --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 1ecb4f8..f592ce9 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "ibexa/tree-builder": "~4.6.x-dev", "ibexa/content-tree": "~4.6.x-dev", "ibexa/image-picker": "~4.6.x-dev", + "ibexa/site-context": "~4.6.x-dev", "gregwar/captcha-bundle": "^2.1" }, "require-dev": { From 40f2425d68736daf29bdf4686faad04524c6585d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 29 Nov 2023 09:18:43 +0100 Subject: [PATCH 8/9] [CI] Adjusted test matrix to CKE40 Node requirement (#35) --- .github/workflows/browser-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 9345f65..fafd4b6 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -20,7 +20,7 @@ on: jobs: regression-headless-setup1: - name: "PHP 7.4/Node 14/PostgreSQL/Varnish/Redis/Multirepository" + name: "PHP 7.4/Node 18/PostgreSQL/Varnish/Redis/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "headless" @@ -31,7 +31,7 @@ jobs: 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' }} multirepository: true - php-image: "ghcr.io/ibexa/docker/php:7.4-node14" + php-image: "ghcr.io/ibexa/docker/php:7.4-node18" job-count: 2 timeout: 90 secrets: @@ -43,7 +43,7 @@ jobs: AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} regression-headless-setup2: - name: "PHP 8.0/Node 16/MySQL/Compatibility layer" + name: "PHP 8.0/Node 18/MySQL/Compatibility layer" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "headless" @@ -54,7 +54,7 @@ jobs: setup: "doc/docker/base-dev.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} use-compatibility-layer: true - php-image: "ghcr.io/ibexa/docker/php:8.0-node16" + php-image: "ghcr.io/ibexa/docker/php:8.0-node18" job-count: 2 timeout: 90 secrets: From 62f6da5b1ba43174d804fc6c126ab1fbb0bdb5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 26 Feb 2024 11:37:27 +0100 Subject: [PATCH 9/9] [Composer] Marked this package as replacement for ibexa/content (#82) --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index f592ce9..b98b248 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,9 @@ "repositories": [ {"type": "composer", "url": "https://updates.ibexa.co"} ], + "replace": { + "ibexa/content": "*" + }, "require": { "php": "^7.4 || ^8.0", "ibexa/oss": "~4.6.x-dev",