From aa7c29af8fc0359e63c01f7851774498c45b4ba8 Mon Sep 17 00:00:00 2001 From: "v.strelchenko" Date: Tue, 22 Aug 2023 12:55:13 +0300 Subject: [PATCH 1/4] SDK-4579. Added info about Composer conflicts --- docs/scu/dev/how-the-spryker-code-upgrader-works.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/scu/dev/how-the-spryker-code-upgrader-works.md b/docs/scu/dev/how-the-spryker-code-upgrader-works.md index 1047716b2c2..6d256114261 100644 --- a/docs/scu/dev/how-the-spryker-code-upgrader-works.md +++ b/docs/scu/dev/how-the-spryker-code-upgrader-works.md @@ -42,6 +42,13 @@ https://api.release.spryker.com/release-group/XXXX To continue running the Upgrader tool, install the major version manually, and re-run the Upgrader tool. +{% info_block infoBox "Composer dependency conflict" %} + +Spryker code upgrader uses the [composer](https://getcomposer.org/) for updating modules and libraries. +If the composer detects a conflict, it stops the update process and returns the error message. To resolve the conflict, you need to manually update the conflicting module and re-run the Upgrader pipline. + +{% endinfo_block %} + ### 3. Creates a Git branch The Upgrader tool creates a separate Git branch to commit the changes to. The branch name follows the pattern: `upgradebot/upgrade-for-{base-branch-name}-{last-commit-hash-in-the-base-branch}`. From 3237f24dd734ad8926b9a9e35016eed15b8ad947 Mon Sep 17 00:00:00 2001 From: "v.strelchenko" Date: Tue, 22 Aug 2023 15:02:48 +0300 Subject: [PATCH 2/4] SDK-4579. Added info about Composer conflicts --- docs/scu/dev/how-the-spryker-code-upgrader-works.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scu/dev/how-the-spryker-code-upgrader-works.md b/docs/scu/dev/how-the-spryker-code-upgrader-works.md index 6d256114261..f4684ad8ec6 100644 --- a/docs/scu/dev/how-the-spryker-code-upgrader-works.md +++ b/docs/scu/dev/how-the-spryker-code-upgrader-works.md @@ -44,8 +44,8 @@ To continue running the Upgrader tool, install the major version manually, and r {% info_block infoBox "Composer dependency conflict" %} -Spryker code upgrader uses the [composer](https://getcomposer.org/) for updating modules and libraries. -If the composer detects a conflict, it stops the update process and returns the error message. To resolve the conflict, you need to manually update the conflicting module and re-run the Upgrader pipline. +Spryker Code Upgrader uses the [composer](https://getcomposer.org/) for updating modules and libraries. +If the composer detects a conflict, it stops the update process and generates an error message. To resolve the conflict, you must manually update the conflicting module and then re-run the Upgrader pipeline. {% endinfo_block %} From aa383025eb34fb5b32cef1ee91623d6769c0e48d Mon Sep 17 00:00:00 2001 From: Vadym Sachenko Date: Tue, 22 Aug 2023 15:34:57 +0300 Subject: [PATCH 3/4] Update how-the-spryker-code-upgrader-works.md --- docs/scu/dev/how-the-spryker-code-upgrader-works.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scu/dev/how-the-spryker-code-upgrader-works.md b/docs/scu/dev/how-the-spryker-code-upgrader-works.md index f4684ad8ec6..c2bd0e91b93 100644 --- a/docs/scu/dev/how-the-spryker-code-upgrader-works.md +++ b/docs/scu/dev/how-the-spryker-code-upgrader-works.md @@ -2,7 +2,7 @@ title: How the Spryker Code Upgrader works description: Spryker Code Upgrader overview template: concept-topic-template -last_updated: Jul 24, 2023 +last_updated: Aug 22, 2023 redirect_from: - /docs/paas-plus/dev/how-the-spryker-code-upgrader-works.html --- From eed4c7e46adb7df17c3fe29b42a9d670911f4cd6 Mon Sep 17 00:00:00 2001 From: Vadym Sachenko Date: Tue, 22 Aug 2023 15:35:18 +0300 Subject: [PATCH 4/4] Apply suggestions from code review --- docs/scu/dev/how-the-spryker-code-upgrader-works.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scu/dev/how-the-spryker-code-upgrader-works.md b/docs/scu/dev/how-the-spryker-code-upgrader-works.md index c2bd0e91b93..b53a895c2b2 100644 --- a/docs/scu/dev/how-the-spryker-code-upgrader-works.md +++ b/docs/scu/dev/how-the-spryker-code-upgrader-works.md @@ -40,12 +40,12 @@ Please follow the link below to find all documentation needed to help you upgrad https://api.release.spryker.com/release-group/XXXX ``` -To continue running the Upgrader tool, install the major version manually, and re-run the Upgrader tool. +To continue running the Upgrader tool, install the major version manually, and rerun the Upgrader tool. {% info_block infoBox "Composer dependency conflict" %} Spryker Code Upgrader uses the [composer](https://getcomposer.org/) for updating modules and libraries. -If the composer detects a conflict, it stops the update process and generates an error message. To resolve the conflict, you must manually update the conflicting module and then re-run the Upgrader pipeline. +If the composer detects a conflict, it stops the update process and generates an error message. To resolve the conflict, you must manually update the conflicting module and rerun the Upgrader pipeline. {% endinfo_block %}