From a8dc02a79972aeadb47d343781df6a0a193af446 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:09:31 +0200 Subject: [PATCH 01/53] Updated spryker-sdk/upgrader dependency (#395) Co-authored-by: pavelmaksimov25 --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 7f0c9248..e81a3e1e 100644 --- a/composer.lock +++ b/composer.lock @@ -7331,12 +7331,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "ef19a855d9abcd97d045a3283627b48ef1e92fd5" + "reference": "9760c27bc11f0b28d720396b2cf295879e83078b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/ef19a855d9abcd97d045a3283627b48ef1e92fd5", - "reference": "ef19a855d9abcd97d045a3283627b48ef1e92fd5", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/9760c27bc11f0b28d720396b2cf295879e83078b", + "reference": "9760c27bc11f0b28d720396b2cf295879e83078b", "shasum": "" }, "require": { @@ -7398,7 +7398,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-06-28T08:15:17+00:00" + "time": "2023-07-04T15:07:58+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16082,8 +16082,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From 5244fe5c4e481e6b44a8a0e0e5c38a0b9ac74f18 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:47:01 +0200 Subject: [PATCH 02/53] Updated spryker-sdk/upgrader dependency (#396) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index e81a3e1e..56529d73 100644 --- a/composer.lock +++ b/composer.lock @@ -7331,12 +7331,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "9760c27bc11f0b28d720396b2cf295879e83078b" + "reference": "9f80dc9a4708b41258adaadc453d70cbdd057d2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/9760c27bc11f0b28d720396b2cf295879e83078b", - "reference": "9760c27bc11f0b28d720396b2cf295879e83078b", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/9f80dc9a4708b41258adaadc453d70cbdd057d2a", + "reference": "9f80dc9a4708b41258adaadc453d70cbdd057d2a", "shasum": "" }, "require": { @@ -7398,7 +7398,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-04T15:07:58+00:00" + "time": "2023-07-04T15:44:56+00:00" }, { "name": "spryker/architecture-sniffer", From a73c4bd98a66ed500c6ab250dcf224d69fa41815 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 13:31:14 +0200 Subject: [PATCH 03/53] Updated spryker-sdk/upgrader dependency (#398) Co-authored-by: pavelmaksimov25 --- composer.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 56529d73..afcee42c 100644 --- a/composer.lock +++ b/composer.lock @@ -7331,12 +7331,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "9f80dc9a4708b41258adaadc453d70cbdd057d2a" + "reference": "e7535c9673163e3d8d87f60cf2c549a50d55eb86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/9f80dc9a4708b41258adaadc453d70cbdd057d2a", - "reference": "9f80dc9a4708b41258adaadc453d70cbdd057d2a", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/e7535c9673163e3d8d87f60cf2c549a50d55eb86", + "reference": "e7535c9673163e3d8d87f60cf2c549a50d55eb86", "shasum": "" }, "require": { @@ -7385,7 +7385,6 @@ "Evaluate\\": "src/Evaluate/", "Upgrader\\": "src/Upgrader/", "ReleaseApp\\": "src/ReleaseApp/", - "CodeCompliance\\": "src/CodeCompliance/", "DynamicEvaluator\\": "src/DynamicEvaluator/" } }, @@ -7398,7 +7397,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-04T15:44:56+00:00" + "time": "2023-07-05T11:18:38+00:00" }, { "name": "spryker/architecture-sniffer", From 02c2e41c0ef16dec38b65e862c91483c109431d0 Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Thu, 6 Jul 2023 13:55:34 +0200 Subject: [PATCH 04/53] Update upgrader and integrator --- composer.lock | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index afcee42c..48c2a8e5 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "d236c5fb3cdbbd1c362ba10d2b5f13880975f09e" + "reference": "6e0c51557e2c706c46e67fe184846dbab160012c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/d236c5fb3cdbbd1c362ba10d2b5f13880975f09e", - "reference": "d236c5fb3cdbbd1c362ba10d2b5f13880975f09e", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/6e0c51557e2c706c46e67fe184846dbab160012c", + "reference": "6e0c51557e2c706c46e67fe184846dbab160012c", "shasum": "" }, "require": { @@ -7136,7 +7136,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-06-20T10:24:15+00:00" + "time": "2023-07-06T11:20:08+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7331,12 +7331,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "e7535c9673163e3d8d87f60cf2c549a50d55eb86" + "reference": "adc90543460e6fc90fa02294427341ffefd5b17e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/e7535c9673163e3d8d87f60cf2c549a50d55eb86", - "reference": "e7535c9673163e3d8d87f60cf2c549a50d55eb86", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/adc90543460e6fc90fa02294427341ffefd5b17e", + "reference": "adc90543460e6fc90fa02294427341ffefd5b17e", "shasum": "" }, "require": { @@ -7397,7 +7397,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-05T11:18:38+00:00" + "time": "2023-07-06T09:47:56+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16081,7 +16081,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From bed140e8cbfcf2c4c64bcf416fecabe8e0689209 Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Thu, 6 Jul 2023 14:33:16 +0200 Subject: [PATCH 05/53] Update tests after upgrader update --- .../Formatter/OutputViolationReportFormatterTest.php | 4 ++-- .../Violation/Formatter/ViolationReportDecoratorTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php index e92ff9ea..410a5154 100644 --- a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php +++ b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php @@ -8,10 +8,10 @@ namespace Sdk\Unit\Infrastructure\Violation\Formatter; use Codeception\Test\Unit; -use CodeCompliance\Domain\Entity\PackageViolationReportInterface; -use CodeCompliance\Domain\Entity\ViolationInterface; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\OutputViolationReportFormatter; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\ViolationReportDecorator; +use SprykerSdk\SdkContracts\Report\Violation\PackageViolationReportInterface; +use SprykerSdk\SdkContracts\Report\Violation\ViolationInterface; use SprykerSdk\SdkContracts\Report\Violation\ViolationReportInterface; use Symfony\Component\Console\Formatter\OutputFormatterInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php index c629b34f..8c45156d 100644 --- a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php +++ b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php @@ -8,10 +8,10 @@ namespace Sdk\Unit\Infrastructure\Violation\Formatter; use Codeception\Test\Unit; -use CodeCompliance\Domain\Entity\PackageViolationReportInterface; -use CodeCompliance\Domain\Entity\ViolationInterface; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\OutputViolationDecoratorInterface; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\ViolationReportDecorator; +use SprykerSdk\SdkContracts\Report\Violation\PackageViolationReportInterface; +use SprykerSdk\SdkContracts\Report\Violation\ViolationInterface; use SprykerSdk\SdkContracts\Report\Violation\ViolationReportInterface; /** From ec6473e160e33d6acae8bd99925e5ae8609bf61b Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Thu, 6 Jul 2023 14:44:08 +0200 Subject: [PATCH 06/53] Update tests after upgrader update --- .../Violation/DocLinkToMessageOutputViolationDecoratorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/InspectionDoc/tests/Unit/Infrastructure/Violation/DocLinkToMessageOutputViolationDecoratorTest.php b/extension/InspectionDoc/tests/Unit/Infrastructure/Violation/DocLinkToMessageOutputViolationDecoratorTest.php index 82c25935..63cbb125 100644 --- a/extension/InspectionDoc/tests/Unit/Infrastructure/Violation/DocLinkToMessageOutputViolationDecoratorTest.php +++ b/extension/InspectionDoc/tests/Unit/Infrastructure/Violation/DocLinkToMessageOutputViolationDecoratorTest.php @@ -8,10 +8,10 @@ namespace InspectionDoc\Tests\Unit\Infrastructure\Violation; use Codeception\Test\Unit; -use CodeCompliance\Domain\Entity\ViolationInterface; use InspectionDoc\Entity\InspectionDocInterface; use InspectionDoc\Infrastructure\Reader\InspectionDocReaderInterface; use InspectionDoc\Infrastructure\Violation\DocLinkToMessageOutputViolationDecorator; +use SprykerSdk\SdkContracts\Report\Violation\ViolationInterface; /** * Auto-generated group annotations From 03c82613113f4e4795c17ae17182ca694e0dd425 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:59:39 +0200 Subject: [PATCH 07/53] Updated spryker-sdk/upgrader dependency (#403) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index c32b4594..81f3d2cf 100644 --- a/composer.lock +++ b/composer.lock @@ -7331,12 +7331,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "adc90543460e6fc90fa02294427341ffefd5b17e" + "reference": "1ca5efa771e5de496b0fbbf510ab63ece62661b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/adc90543460e6fc90fa02294427341ffefd5b17e", - "reference": "adc90543460e6fc90fa02294427341ffefd5b17e", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/1ca5efa771e5de496b0fbbf510ab63ece62661b0", + "reference": "1ca5efa771e5de496b0fbbf510ab63ece62661b0", "shasum": "" }, "require": { @@ -7397,7 +7397,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-06T09:47:56+00:00" + "time": "2023-07-10T15:57:17+00:00" }, { "name": "spryker/architecture-sniffer", From d993d8f665693359ac31a167e091417bd2d8ac9f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:51:29 +0200 Subject: [PATCH 08/53] Updated spryker-sdk/integrator dependency (#404) Co-authored-by: pavelmaksimov25 --- composer.lock | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 81f3d2cf..a56e591e 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "6e0c51557e2c706c46e67fe184846dbab160012c" + "reference": "df9a0acd9c8ab1f9cb49478aa60b2208bc2719b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/6e0c51557e2c706c46e67fe184846dbab160012c", - "reference": "6e0c51557e2c706c46e67fe184846dbab160012c", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/df9a0acd9c8ab1f9cb49478aa60b2208bc2719b2", + "reference": "df9a0acd9c8ab1f9cb49478aa60b2208bc2719b2", "shasum": "" }, "require": { @@ -7096,6 +7096,8 @@ "composer-plugin-api": "^1.0.0 || ^2.0.0", "composer/composer": "^2.1.0", "czproject/git-php": "^4.1", + "ext-dom": "*", + "ext-simplexml": "*", "laminas/laminas-filter": "^2.11.0", "nikic/php-parser": "^4.3.0", "php": ">=7.4", @@ -7136,7 +7138,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-07-06T11:20:08+00:00" + "time": "2023-07-11T11:31:30+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -16081,7 +16083,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From 429c00905b58467b93da89d41bc90d7dd32b1384 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 16:10:19 +0200 Subject: [PATCH 09/53] Updated spryker-sdk/upgrader dependency (#405) Co-authored-by: pavelmaksimov25 Co-authored-by: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index a56e591e..fe6fa5f1 100644 --- a/composer.lock +++ b/composer.lock @@ -7333,12 +7333,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "1ca5efa771e5de496b0fbbf510ab63ece62661b0" + "reference": "3418447853f89b09c89483bf54bb5f3d6e56030b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/1ca5efa771e5de496b0fbbf510ab63ece62661b0", - "reference": "1ca5efa771e5de496b0fbbf510ab63ece62661b0", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/3418447853f89b09c89483bf54bb5f3d6e56030b", + "reference": "3418447853f89b09c89483bf54bb5f3d6e56030b", "shasum": "" }, "require": { @@ -7399,7 +7399,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-10T15:57:17+00:00" + "time": "2023-07-11T11:45:34+00:00" }, { "name": "spryker/architecture-sniffer", From 1e9b622b3be7aa09ff3121d29add0e726fc44466 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:45:56 +0200 Subject: [PATCH 10/53] Updated spryker-sdk/integrator dependency (#406) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index fe6fa5f1..5e0e4457 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "df9a0acd9c8ab1f9cb49478aa60b2208bc2719b2" + "reference": "46825e1a29a95f82b526965d92009898d2a9aead" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/df9a0acd9c8ab1f9cb49478aa60b2208bc2719b2", - "reference": "df9a0acd9c8ab1f9cb49478aa60b2208bc2719b2", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/46825e1a29a95f82b526965d92009898d2a9aead", + "reference": "46825e1a29a95f82b526965d92009898d2a9aead", "shasum": "" }, "require": { @@ -7138,7 +7138,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-07-11T11:31:30+00:00" + "time": "2023-07-11T15:40:39+00:00" }, { "name": "spryker-sdk/sdk-contracts", From 864c4e0f79dfb578404a40983b1c73037588a5a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:27:12 +0200 Subject: [PATCH 11/53] Updated spryker-sdk/upgrader dependency (#407) Co-authored-by: pavelmaksimov25 Co-authored-by: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5e0e4457..7b428df2 100644 --- a/composer.lock +++ b/composer.lock @@ -7333,12 +7333,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "3418447853f89b09c89483bf54bb5f3d6e56030b" + "reference": "cab76db74e14207de3dbf5481153b6beedc07eff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/3418447853f89b09c89483bf54bb5f3d6e56030b", - "reference": "3418447853f89b09c89483bf54bb5f3d6e56030b", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/cab76db74e14207de3dbf5481153b6beedc07eff", + "reference": "cab76db74e14207de3dbf5481153b6beedc07eff", "shasum": "" }, "require": { @@ -7399,7 +7399,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-11T11:45:34+00:00" + "time": "2023-07-13T08:44:43+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16083,8 +16083,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From a979774b9d5e75ba56d782f59e943b703baaca8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:47:41 +0200 Subject: [PATCH 12/53] Updated spryker-sdk/upgrader dependency (#408) Co-authored-by: pavelmaksimov25 Co-authored-by: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 7b428df2..dee425ea 100644 --- a/composer.lock +++ b/composer.lock @@ -7333,12 +7333,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "cab76db74e14207de3dbf5481153b6beedc07eff" + "reference": "f36071f2c572db8fd800ee456aca3812cf43c973" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/cab76db74e14207de3dbf5481153b6beedc07eff", - "reference": "cab76db74e14207de3dbf5481153b6beedc07eff", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/f36071f2c572db8fd800ee456aca3812cf43c973", + "reference": "f36071f2c572db8fd800ee456aca3812cf43c973", "shasum": "" }, "require": { @@ -7399,7 +7399,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-13T08:44:43+00:00" + "time": "2023-07-13T08:45:30+00:00" }, { "name": "spryker/architecture-sniffer", From 73775a6b099f1b23ec5f54f92a7e7849849b9035 Mon Sep 17 00:00:00 2001 From: Pavlo Date: Thu, 13 Jul 2023 12:11:28 +0200 Subject: [PATCH 13/53] Updated upgrader dependencies. --- composer.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index dee425ea..a02840ff 100644 --- a/composer.lock +++ b/composer.lock @@ -16083,7 +16083,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From 0370e3b26e807dde5bd73700fb134cd2facecce1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:03:14 +0200 Subject: [PATCH 14/53] Updated spryker-sdk/integrator dependency (#410) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index a02840ff..e89fc7ea 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "46825e1a29a95f82b526965d92009898d2a9aead" + "reference": "b5d1cae80caea3a2e43876c721abb559cca545f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/46825e1a29a95f82b526965d92009898d2a9aead", - "reference": "46825e1a29a95f82b526965d92009898d2a9aead", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/b5d1cae80caea3a2e43876c721abb559cca545f6", + "reference": "b5d1cae80caea3a2e43876c721abb559cca545f6", "shasum": "" }, "require": { @@ -7138,7 +7138,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-07-11T15:40:39+00:00" + "time": "2023-07-14T12:58:51+00:00" }, { "name": "spryker-sdk/sdk-contracts", From fb106053369f8cd4b66ac1c36ad8661f9a640c9e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:12:55 +0200 Subject: [PATCH 15/53] Updated spryker-sdk/upgrader dependency (#411) Co-authored-by: pavelmaksimov25 Co-authored-by: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index e89fc7ea..1382b3b7 100644 --- a/composer.lock +++ b/composer.lock @@ -7333,12 +7333,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "f36071f2c572db8fd800ee456aca3812cf43c973" + "reference": "7d71f35d0297f301be93e1f68c0440364669afc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/f36071f2c572db8fd800ee456aca3812cf43c973", - "reference": "f36071f2c572db8fd800ee456aca3812cf43c973", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/7d71f35d0297f301be93e1f68c0440364669afc8", + "reference": "7d71f35d0297f301be93e1f68c0440364669afc8", "shasum": "" }, "require": { @@ -7399,7 +7399,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-13T08:45:30+00:00" + "time": "2023-07-14T13:03:41+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16083,8 +16083,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From 08cce16bd83915701a59ab8465b331ee77de8da3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 17:20:49 +0200 Subject: [PATCH 16/53] Updated spryker-sdk/integrator dependency (#413) Co-authored-by: pavelmaksimov25 --- composer.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 1382b3b7..22d13308 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "b5d1cae80caea3a2e43876c721abb559cca545f6" + "reference": "715fc75acbda170b8387f76925fdff8b56b6a6cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/b5d1cae80caea3a2e43876c721abb559cca545f6", - "reference": "b5d1cae80caea3a2e43876c721abb559cca545f6", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/715fc75acbda170b8387f76925fdff8b56b6a6cb", + "reference": "715fc75acbda170b8387f76925fdff8b56b6a6cb", "shasum": "" }, "require": { @@ -7138,7 +7138,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-07-14T12:58:51+00:00" + "time": "2023-07-24T15:19:46+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -16083,7 +16083,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From 984a2f5f0c5ba63024880245185f62014343387b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 17:22:23 +0200 Subject: [PATCH 17/53] Updated spryker-sdk/upgrader dependency (#414) Co-authored-by: pavelmaksimov25 --- composer.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 22d13308..5636ae36 100644 --- a/composer.lock +++ b/composer.lock @@ -16083,8 +16083,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From 63a7828d1c08d73f4887a5d6b1757439079d8a66 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Tue, 25 Jul 2023 11:26:07 +0200 Subject: [PATCH 18/53] SDK-2901: Introduced mutliple php versions for the upgrader CI. (#415) --- .codecov.yml | 48 ++++++++++++- .github/workflows/ci.yml | 27 ++++---- .github/workflows/post-release.yml | 66 ++++++++++++++++-- config/services.yaml | 6 +- infrastructure/sdk.sprykerci74.Dockerfile | 67 ++++++++++++++++++ ....Dockerfile => sdk.sprykerci80.Dockerfile} | 0 infrastructure/sdk.sprykerci81.Dockerfile | 68 +++++++++++++++++++ .../OutputViolationReportFormatterTest.php | 22 +----- .../ViolationReportDecoratorTest.php | 24 +------ 9 files changed, 261 insertions(+), 67 deletions(-) create mode 100644 infrastructure/sdk.sprykerci74.Dockerfile rename infrastructure/{sdk.sprykerci.Dockerfile => sdk.sprykerci80.Dockerfile} (100%) create mode 100644 infrastructure/sdk.sprykerci81.Dockerfile diff --git a/.codecov.yml b/.codecov.yml index 506169ac..3385f957 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,4 +1,50 @@ coverage: - range: 95..100 + range: 70..80 round: nearest precision: 2 + +ignore: + - "app" + - "assets" + - "bin" + - "build" + - "config" + - "db" + - "docs" + - "frontend" + - "infrastructure" + - "public" + - "Sniffs" + - "translations" + - "var" + - "vendor" + - "src/Core/Application/Dependency" + - "src/Core/Application/DependencyInjection" + - "src/Core/Application/Dto" + - "src/Core/Application/Exception" + - "src/Core/Application/Resources" + - "src/Core/Domain" + - "src/Core/SprykerSdkCoreBundle.php" + - "src/Extension/DependencyInjection" + - "src/Extension/Resources" + - "src/Extension/SprykerSdkExtensionBundle.php" + - "src/Infrastructure/DependencyInjection" + - "src/Infrastructure/Dto" + - "src/Infrastructure/Entity" + - "src/Infrastructure/Event" + - "src/Infrastructure/Exception" + - "src/Infrastructure/Resources" + - "src/Infrastructure/SprykerSdkInfrastructureBundle.php" + - "src/Presentation/Console/DependencyInjection" + - "src/Presentation/Console/Resources" + - "src/Presentation/Ide/Dto" + - "src/Presentation/RestApi/Enum" + - "src/Presentation/RestApi/Exception" + - "src/Presentation/RestApi/Resources" + - "src/Presentation/RestApi/SprykerSdkRestApiBundle.php" + - "**/*.md" + - "**/*.yml" + - "**/*.yaml" + - "**/*.json" + - "**/*.xml" + - "**/*.lock" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2c843d5..f00ec916 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: env: APP_ENV: test # Symfony application environment - CODECOV_TOKEN: a223186e-69ca-438b-bc5a-aa509559fdd0 + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} jobs: validation: @@ -22,7 +22,6 @@ jobs: matrix: php-version: [ '7.4', - '8.0', '8.1' ] @@ -76,19 +75,19 @@ jobs: - name: Codecept unit tests run: composer test-vcs-connector-extension - - name: Codecept unit tests - run: composer test-inspection-doc-extension + - name: Codecept unit tests + run: composer test-inspection-doc-extension - - name: Install SDK - run: bin/console sdk:init:hidden-sdk -n + - name: Install SDK + run: bin/console sdk:init:hidden-sdk -n - - name: Codecept acceptance tests - run: composer test-qa + - name: Codecept acceptance tests + run: composer test-qa - - name: Codecept tests with coverage - if: ${{ matrix.php-version == '8.0' }} - run: composer test-cover + - name: Codecept tests with coverage + if: ${{ matrix.php-version == '8.1' }} + run: composer test-cover - - name: Code Coverage Report - if: success() && matrix.php-version == '8.0' - uses: codecov/codecov-action@v1 + - name: Code Coverage Report + if: success() && matrix.php-version == '8.1' + uses: codecov/codecov-action@v1 diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 3a41132b..7d5a02cb 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -6,7 +6,7 @@ on: jobs: docker: - name: Build and push release docker images + name: Build and push SDK semver release docker images runs-on: ubuntu-22.04 steps: # https://github.com/actions/checkout @@ -39,8 +39,8 @@ jobs: tags: spryker/php-sdk:${{ github.event.release.tag_name }} labels: Release ${{ github.event.release.tag_name }} - docker-sprykerci: - name: Build and push docker image for SprykerCI + docker-sprykerci-74: + name: Build and push docker image for SprykerCI PHP 7.4 runs-on: ubuntu-22.04 needs: docker steps: @@ -61,10 +61,66 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: ./infrastructure/sdk.sprykerci.Dockerfile + file: ./infrastructure/sdk.sprykerci74.Dockerfile platforms: linux/amd64 push: true - tags: spryker/php-sdk:sprykerci + tags: spryker/php-sdk:sprykerci-7.4 + labels: SprykerCI + + docker-sprykerci-80: + name: Build and push docker image for SprykerCI PHP 8.0 + runs-on: ubuntu-22.04 + needs: docker + steps: + # https://github.com/actions/checkout + - name: Checkout codebase + uses: actions/checkout@v2 + + # https://github.com/docker/login-action + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + # https://github.com/docker/build-push-action + - name: Build and push + id: docker_build + uses: docker/build-push-action@v3 + with: + context: . + file: ./infrastructure/sdk.sprykerci80.Dockerfile + platforms: linux/amd64 + push: true + tags: spryker/php-sdk:sprykerci-8.0,spryker/php-sdk:sprykerci + labels: SprykerCI + + docker-sprykerci-81: + name: Build and push docker image for SprykerCI PHP 8.1 + runs-on: ubuntu-22.04 + needs: docker + steps: + # https://github.com/actions/checkout + - name: Checkout codebase + uses: actions/checkout@v2 + + # https://github.com/docker/login-action + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + # https://github.com/docker/build-push-action + - name: Build and push + id: docker_build + uses: docker/build-push-action@v3 + with: + context: . + file: ./infrastructure/sdk.sprykerci81.Dockerfile + platforms: linux/amd64 + push: true + tags: spryker/php-sdk:sprykerci-8.1 labels: SprykerCI installer: diff --git a/config/services.yaml b/config/services.yaml index 3a3934a4..2357274e 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -17,10 +17,10 @@ services: exclude: '../app/{DependencyInjection,Entity,Tests,Kernel.php}' SprykerSdk\Sdk\Core\: resource: '../src/Core' - exclude: '../src/{DependencyInjection,Entity,Enum,Tests,Kernel.php}' + exclude: '../src/Core/{DependencyInjection,Entity,Enum,Tests,Kernel.php}' SprykerSdk\Sdk\Infrastructure\: resource: '../src/Infrastructure' - exclude: '../src/{DependencyInjection,Entity,Tests,Kernel.php}' + exclude: '../src/Infrastructure/{DependencyInjection,Entity,Tests,Kernel.php}' SprykerSdk\Sdk\Presentation\Console\: resource: '../src/Presentation/Console' - exclude: '../src/{DependencyInjection,Entity,Tests,Kernel.php}' + exclude: '../src/Presentation/Console/{DependencyInjection,Entity,Tests,Kernel.php}' diff --git a/infrastructure/sdk.sprykerci74.Dockerfile b/infrastructure/sdk.sprykerci74.Dockerfile new file mode 100644 index 00000000..411e07e4 --- /dev/null +++ b/infrastructure/sdk.sprykerci74.Dockerfile @@ -0,0 +1,67 @@ +ARG SPRYKER_PARENT_IMAGE=spryker/php:7.4 + +FROM ${SPRYKER_PARENT_IMAGE} AS application-production-dependencies + +USER root + +RUN apk update \ + && apk add --no-cache \ + curl \ + git \ + graphviz \ + nodejs \ + npm \ + rsync \ + && npm install -g npm@8.4.1 + +RUN git config --add --system safe.directory /project + +######################################## +# New Relic Extension +# It's already in the core image. +######################################## +COPY infrastructure/newrelic/newrelic.ini /usr/local/etc/php/conf.d/90-newrelic.ini + +ARG SPRYKER_COMPOSER_MODE + +FROM application-production-dependencies AS application-production-codebase + +RUN chown spryker:spryker ${srcRoot} + +USER spryker +# Authorize SSH Host +RUN mkdir -p /home/spryker/.ssh && \ + chmod 0700 /home/spryker/.ssh && \ + ssh-keyscan github.com > /home/spryker/.ssh/known_hosts + +COPY --chown=spryker:spryker phpstan-bootstrap.php ${srcRoot}/phpstan-bootstrap.php +COPY --chown=spryker:spryker assets ${srcRoot}/assets +COPY --chown=spryker:spryker src ${srcRoot}/src +COPY --chown=spryker:spryker app ${srcRoot}/app +COPY --chown=spryker:spryker db ${srcRoot}/db +COPY --chown=spryker:spryker extension ${srcRoot}/extension +COPY --chown=spryker:spryker config ${srcRoot}/config +COPY --chown=spryker:spryker frontend ${srcRoot}/frontend +COPY --chown=spryker:spryker bin ${srcRoot}/bin +COPY --chown=spryker:spryker .env ${srcRoot}/.env +COPY --chown=spryker:spryker .env.prod ${srcRoot}/.env.prod +COPY --chown=spryker:spryker .env.sprykerci ${srcRoot}/.env.sprykerci +COPY --chown=spryker:spryker composer.json composer.lock package.json package-lock.json bootstrap.php phpstan-bootstrap.php ${srcRoot}/ + +COPY --chown=spryker:spryker infrastructure/newrelic/entrypoint.sh ${srcRoot}/entrypoint.sh +RUN chmod +x ${srcRoot}/entrypoint.sh + +WORKDIR ${srcRoot} + +ENV APP_ENV=sprykerci +ENV NRIA_ENABLE_PROCESS_METRICS=true + +RUN npm install + +RUN composer install --no-scripts --no-interaction --optimize-autoloader -vvv --no-dev + +RUN composer dump-env sprykerci + +RUN bin/console cache:clear --no-debug + +ENTRYPOINT ["/data/entrypoint.sh"] diff --git a/infrastructure/sdk.sprykerci.Dockerfile b/infrastructure/sdk.sprykerci80.Dockerfile similarity index 100% rename from infrastructure/sdk.sprykerci.Dockerfile rename to infrastructure/sdk.sprykerci80.Dockerfile diff --git a/infrastructure/sdk.sprykerci81.Dockerfile b/infrastructure/sdk.sprykerci81.Dockerfile new file mode 100644 index 00000000..7616233a --- /dev/null +++ b/infrastructure/sdk.sprykerci81.Dockerfile @@ -0,0 +1,68 @@ +ARG SPRYKER_PARENT_IMAGE=spryker/php:8.1 + +FROM ${SPRYKER_PARENT_IMAGE} AS application-production-dependencies + +USER root + +RUN apk update \ + && apk add --no-cache \ + curl \ + git \ + graphviz \ + nodejs \ + npm \ + rsync \ + && npm install -g npm@8.4.1 + +RUN git config --add --system safe.directory /project + +######################################## +# New Relic Extension +# It's already in the core image. +######################################## + +COPY infrastructure/newrelic/newrelic.ini /usr/local/etc/php/conf.d/90-newrelic.ini + +ARG SPRYKER_COMPOSER_MODE + +FROM application-production-dependencies AS application-production-codebase + +RUN chown spryker:spryker ${srcRoot} + +USER spryker +# Authorize SSH Host +RUN mkdir -p /home/spryker/.ssh && \ + chmod 0700 /home/spryker/.ssh && \ + ssh-keyscan github.com > /home/spryker/.ssh/known_hosts + +COPY --chown=spryker:spryker phpstan-bootstrap.php ${srcRoot}/phpstan-bootstrap.php +COPY --chown=spryker:spryker assets ${srcRoot}/assets +COPY --chown=spryker:spryker src ${srcRoot}/src +COPY --chown=spryker:spryker app ${srcRoot}/app +COPY --chown=spryker:spryker db ${srcRoot}/db +COPY --chown=spryker:spryker extension ${srcRoot}/extension +COPY --chown=spryker:spryker config ${srcRoot}/config +COPY --chown=spryker:spryker frontend ${srcRoot}/frontend +COPY --chown=spryker:spryker bin ${srcRoot}/bin +COPY --chown=spryker:spryker .env ${srcRoot}/.env +COPY --chown=spryker:spryker .env.prod ${srcRoot}/.env.prod +COPY --chown=spryker:spryker .env.sprykerci ${srcRoot}/.env.sprykerci +COPY --chown=spryker:spryker composer.json composer.lock package.json package-lock.json bootstrap.php phpstan-bootstrap.php ${srcRoot}/ + +COPY --chown=spryker:spryker infrastructure/newrelic/entrypoint.sh ${srcRoot}/entrypoint.sh +RUN chmod +x ${srcRoot}/entrypoint.sh + +WORKDIR ${srcRoot} + +ENV APP_ENV=sprykerci +ENV NRIA_ENABLE_PROCESS_METRICS=true + +RUN npm install + +RUN composer install --no-scripts --no-interaction --optimize-autoloader -vvv --no-dev + +RUN composer dump-env sprykerci + +RUN bin/console cache:clear --no-debug + +ENTRYPOINT ["/data/entrypoint.sh"] diff --git a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php index 410a5154..5f754006 100644 --- a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php +++ b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/OutputViolationReportFormatterTest.php @@ -10,8 +10,6 @@ use Codeception\Test\Unit; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\OutputViolationReportFormatter; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\ViolationReportDecorator; -use SprykerSdk\SdkContracts\Report\Violation\PackageViolationReportInterface; -use SprykerSdk\SdkContracts\Report\Violation\ViolationInterface; use SprykerSdk\SdkContracts\Report\Violation\ViolationReportInterface; use Symfony\Component\Console\Formatter\OutputFormatterInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -61,33 +59,15 @@ protected function setUp(): void public function testFormat(): void { // Arrange - $violationMock = $this->createMock(ViolationInterface::class); $violationReportMock = $this->createMock(ViolationReportInterface::class); - $packageViolationReportMock = $this->createMock(PackageViolationReportInterface::class); $this->violationReportDecorator ->expects($this->once()) ->method('decorate') ->willReturn($violationReportMock); - $packageViolationReportMock - ->expects($this->once()) - ->method('getViolations') - ->willReturn([$violationMock]); - - $packageViolationReportMock - ->expects($this->once()) - ->method('getFileViolations') - ->willReturn(['path' => [$violationMock]]); - - $violationReportMock - ->method('getViolations') - ->willReturn([$violationMock]); - $violationReportMock - ->method('getPackages') - ->willReturn([$packageViolationReportMock]); $this->output - ->expects($this->atLeastOnce()) + ->expects($this->never()) ->method('writeln'); $yamlViolationReportFormatter = new OutputViolationReportFormatter($this->violationReportDecorator); diff --git a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php index 8c45156d..2eda0a7b 100644 --- a/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php +++ b/tests/Sdk/Unit/Infrastructure/Violation/Formatter/ViolationReportDecoratorTest.php @@ -10,8 +10,6 @@ use Codeception\Test\Unit; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\OutputViolationDecoratorInterface; use SprykerSdk\Sdk\Infrastructure\Violation\Formatter\ViolationReportDecorator; -use SprykerSdk\SdkContracts\Report\Violation\PackageViolationReportInterface; -use SprykerSdk\SdkContracts\Report\Violation\ViolationInterface; use SprykerSdk\SdkContracts\Report\Violation\ViolationReportInterface; /** @@ -46,30 +44,10 @@ protected function setUp(): void public function testDecorate(): void { // Arrange - $violationMock = $this->createMock(ViolationInterface::class); $violationReportMock = $this->createMock(ViolationReportInterface::class); - $packageViolationReportMock = $this->createMock(PackageViolationReportInterface::class); - $packageViolationReportMock - ->expects($this->once()) - ->method('getViolations') - ->willReturn([$violationMock]); - - $packageViolationReportMock - ->expects($this->once()) - ->method('getFileViolations') - ->willReturn(['path' => [$violationMock]]); - - $violationReportMock - ->method('getViolations') - ->willReturn([$violationMock]); - - $violationReportMock - ->expects($this->once()) - ->method('getPackages') - ->willReturn([$packageViolationReportMock]); $this->outputViolationDecorator - ->expects($this->exactly(3)) + ->expects($this->never()) ->method('decorate') ->willReturnArgument(0); From c83af64ae1b6a1b5136e52d85ff258f4b7875a94 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Tue, 25 Jul 2023 12:06:16 +0200 Subject: [PATCH 19/53] Fixed post-release file --- .github/workflows/post-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 7d5a02cb..69189a0e 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -160,7 +160,7 @@ jobs: trigger-sprykerci: name: Triggers SprykerCI post-release pipeline runs-on: ubuntu-22.04 - needs: [ docker-sprykerci, installer ] + needs: [ docker-sprykerci-74, docker-sprykerci-80, docker-sprykerci-81, installer ] steps: - name: Trigger CI pipeline shell: bash From f8ade47f59ccb3c65f62e68cc58681ec04bc136e Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Wed, 2 Aug 2023 13:51:40 +0200 Subject: [PATCH 20/53] Update upgrader and integrator --- composer.lock | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 5636ae36..89ec3e4c 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "715fc75acbda170b8387f76925fdff8b56b6a6cb" + "reference": "be837683956a099d6ac1c79e68552f2747311b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/715fc75acbda170b8387f76925fdff8b56b6a6cb", - "reference": "715fc75acbda170b8387f76925fdff8b56b6a6cb", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/be837683956a099d6ac1c79e68552f2747311b5d", + "reference": "be837683956a099d6ac1c79e68552f2747311b5d", "shasum": "" }, "require": { @@ -7138,7 +7138,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-07-24T15:19:46+00:00" + "time": "2023-08-02T11:30:28+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7333,12 +7333,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "7d71f35d0297f301be93e1f68c0440364669afc8" + "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/7d71f35d0297f301be93e1f68c0440364669afc8", - "reference": "7d71f35d0297f301be93e1f68c0440364669afc8", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/750fc847e8f99771e1e7676a7bd88f3bb39d1014", + "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014", "shasum": "" }, "require": { @@ -7399,7 +7399,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-07-14T13:03:41+00:00" + "time": "2023-08-02T11:34:54+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16083,7 +16083,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From 498c5c844fb0465ea60d961a875ddabdac8634ea Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Thu, 3 Aug 2023 15:09:36 +0200 Subject: [PATCH 21/53] Update evaluator --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 89ec3e4c..9a6c7167 100644 --- a/composer.lock +++ b/composer.lock @@ -7005,16 +7005,16 @@ }, { "name": "spryker-sdk/evaluator", - "version": "0.1.1", + "version": "0.1.4", "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "c7fd2f9782de0b1120ea8e39c788d068c749181d" + "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/c7fd2f9782de0b1120ea8e39c788d068c749181d", - "reference": "c7fd2f9782de0b1120ea8e39c788d068c749181d", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", + "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", "shasum": "" }, "require": { @@ -7073,9 +7073,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.1" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.4" }, - "time": "2023-06-28T08:54:05+00:00" + "time": "2023-07-31T09:39:39+00:00" }, { "name": "spryker-sdk/integrator", From beed1a2ed1151123b8aa722f0fabe67772d0e056 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:05:18 +0200 Subject: [PATCH 22/53] Updated spryker-sdk/upgrader dependency (#426) Co-authored-by: pavelmaksimov25 --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 9a6c7167..c7fd01b6 100644 --- a/composer.lock +++ b/composer.lock @@ -7333,15 +7333,16 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014" + "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/750fc847e8f99771e1e7676a7bd88f3bb39d1014", - "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", + "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", "shasum": "" }, "require": { + "composer/semver": "^3.3", "davidrjonas/composer-lock-diff": "^1.6", "ergebnis/json-printer": "^3.1", "ext-json": "*", @@ -7399,7 +7400,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-02T11:34:54+00:00" + "time": "2023-08-07T09:03:48+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16083,8 +16084,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From ce7117ef765d57bee8770b02321e4fe823127bb3 Mon Sep 17 00:00:00 2001 From: Sergey <100715007+sergeyspryker@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:45:03 +0200 Subject: [PATCH 23/53] SDK-4262 add check for file existence (#423) * SDK-4262 add check for file existence * SDK-4262 fix ci docker files --------- Co-authored-by: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Co-authored-by: Dmytro Klyman --- infrastructure/sdk.sprykerci74.Dockerfile | 2 ++ infrastructure/sdk.sprykerci80.Dockerfile | 2 ++ infrastructure/sdk.sprykerci81.Dockerfile | 2 ++ src/Infrastructure/Service/TasksRepositoryInstaller.php | 4 ++++ 4 files changed, 10 insertions(+) diff --git a/infrastructure/sdk.sprykerci74.Dockerfile b/infrastructure/sdk.sprykerci74.Dockerfile index 411e07e4..fe7a45ca 100644 --- a/infrastructure/sdk.sprykerci74.Dockerfile +++ b/infrastructure/sdk.sprykerci74.Dockerfile @@ -62,6 +62,8 @@ RUN composer install --no-scripts --no-interaction --optimize-autoloader -vvv -- RUN composer dump-env sprykerci +RUN bin/console sdk:init:sdk -n + RUN bin/console cache:clear --no-debug ENTRYPOINT ["/data/entrypoint.sh"] diff --git a/infrastructure/sdk.sprykerci80.Dockerfile b/infrastructure/sdk.sprykerci80.Dockerfile index 2c428f60..ff238491 100644 --- a/infrastructure/sdk.sprykerci80.Dockerfile +++ b/infrastructure/sdk.sprykerci80.Dockerfile @@ -62,6 +62,8 @@ RUN composer install --no-scripts --no-interaction --optimize-autoloader -vvv -- RUN composer dump-env sprykerci +RUN bin/console sdk:init:sdk -n + RUN bin/console cache:clear --no-debug ENTRYPOINT ["/data/entrypoint.sh"] diff --git a/infrastructure/sdk.sprykerci81.Dockerfile b/infrastructure/sdk.sprykerci81.Dockerfile index 7616233a..c34af5b0 100644 --- a/infrastructure/sdk.sprykerci81.Dockerfile +++ b/infrastructure/sdk.sprykerci81.Dockerfile @@ -63,6 +63,8 @@ RUN composer install --no-scripts --no-interaction --optimize-autoloader -vvv -- RUN composer dump-env sprykerci +RUN bin/console sdk:init:sdk -n + RUN bin/console cache:clear --no-debug ENTRYPOINT ["/data/entrypoint.sh"] diff --git a/src/Infrastructure/Service/TasksRepositoryInstaller.php b/src/Infrastructure/Service/TasksRepositoryInstaller.php index fd9a212b..ebc752a0 100644 --- a/src/Infrastructure/Service/TasksRepositoryInstaller.php +++ b/src/Infrastructure/Service/TasksRepositoryInstaller.php @@ -45,6 +45,10 @@ public function __construct(string $gitModulesPath, LoggerInterface $logger, str */ public function install(): array { + if (!is_file($this->gitModulesPath)) { + return []; + } + $gitModules = parse_ini_file($this->gitModulesPath, true); if (!$gitModules) { From 17e2ed08650770b593ad3444b1442eaa48b05800 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:05:11 +0200 Subject: [PATCH 24/53] Updated spryker-sdk/integrator dependency (#427) --- composer.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index c7fd01b6..25cb1090 100644 --- a/composer.lock +++ b/composer.lock @@ -7083,12 +7083,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "be837683956a099d6ac1c79e68552f2747311b5d" + "reference": "6a4c836bdf1b4706443e7aea61946ca9eb65f948" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/be837683956a099d6ac1c79e68552f2747311b5d", - "reference": "be837683956a099d6ac1c79e68552f2747311b5d", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/6a4c836bdf1b4706443e7aea61946ca9eb65f948", + "reference": "6a4c836bdf1b4706443e7aea61946ca9eb65f948", "shasum": "" }, "require": { @@ -7138,7 +7138,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-02T11:30:28+00:00" + "time": "2023-08-07T11:01:23+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -16084,7 +16084,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From ed0fb008ee2fb75cd7eca3b7e5d0c9c11e8041f0 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:50:08 +0200 Subject: [PATCH 25/53] Updated evaluator version --- composer.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 25cb1090..3e8f18f4 100644 --- a/composer.lock +++ b/composer.lock @@ -7005,16 +7005,16 @@ }, { "name": "spryker-sdk/evaluator", - "version": "0.1.4", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3" + "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", - "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/1acb655209157b309e58e8f79dfd6a2be93e901a", + "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a", "shasum": "" }, "require": { @@ -7023,6 +7023,7 @@ "ext-iconv": "*", "ext-json": "*", "guzzlehttp/guzzle": "^7.5", + "laminas/laminas-filter": "^2.11.0", "php": ">=7.4", "spryker-sdk/security-checker": "^0.2.0", "symfony/console": "^5.4|^6.0", @@ -7073,9 +7074,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.4" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.5" }, - "time": "2023-07-31T09:39:39+00:00" + "time": "2023-08-07T12:28:16+00:00" }, { "name": "spryker-sdk/integrator", From 35d42b3f39388f25d19598b8414873cdaf50d3be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:01:28 +0200 Subject: [PATCH 26/53] Updated spryker-sdk/integrator (#429) --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 3e8f18f4..d05f23dd 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "6a4c836bdf1b4706443e7aea61946ca9eb65f948" + "reference": "df309ebf83b34f0c57c42798ea233f7a370a2b97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/6a4c836bdf1b4706443e7aea61946ca9eb65f948", - "reference": "6a4c836bdf1b4706443e7aea61946ca9eb65f948", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/df309ebf83b34f0c57c42798ea233f7a370a2b97", + "reference": "df309ebf83b34f0c57c42798ea233f7a370a2b97", "shasum": "" }, "require": { @@ -7139,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-07T11:01:23+00:00" + "time": "2023-08-08T10:39:52+00:00" }, { "name": "spryker-sdk/sdk-contracts", From 43e0fd32ba0b62adc629ee344d2f93ef5fab1a5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:20:19 +0200 Subject: [PATCH 27/53] Updated spryker-sdk/integrator dependency (#430) Co-authored-by: pavelmaksimov25 From fef49222fed2e0542302a350a71281c75e1ad3a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:32:24 +0200 Subject: [PATCH 28/53] Updated spryker-sdk/integrator dependency (#431) --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index d05f23dd..be75ca54 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "df309ebf83b34f0c57c42798ea233f7a370a2b97" + "reference": "a1873627f619b87f245496663439f31d4090a48c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/df309ebf83b34f0c57c42798ea233f7a370a2b97", - "reference": "df309ebf83b34f0c57c42798ea233f7a370a2b97", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/a1873627f619b87f245496663439f31d4090a48c", + "reference": "a1873627f619b87f245496663439f31d4090a48c", "shasum": "" }, "require": { @@ -7139,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-08T10:39:52+00:00" + "time": "2023-08-09T07:19:39+00:00" }, { "name": "spryker-sdk/sdk-contracts", From 6b034bb197cbc4e969f85c179111a82a161ecdc3 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Wed, 9 Aug 2023 13:54:59 +0200 Subject: [PATCH 29/53] Revert "Updated evaluator version" This reverts commit ed0fb008ee2fb75cd7eca3b7e5d0c9c11e8041f0. --- composer.lock | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index f5b82e34..422b3c65 100644 --- a/composer.lock +++ b/composer.lock @@ -7000,16 +7000,16 @@ }, { "name": "spryker-sdk/evaluator", - "version": "0.1.5", + "version": "0.1.4", "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a" + "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/1acb655209157b309e58e8f79dfd6a2be93e901a", - "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", + "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", "shasum": "" }, "require": { @@ -7018,7 +7018,6 @@ "ext-iconv": "*", "ext-json": "*", "guzzlehttp/guzzle": "^7.5", - "laminas/laminas-filter": "^2.11.0", "php": ">=7.4", "spryker-sdk/security-checker": "^0.2.0", "symfony/console": "^5.4|^6.0", @@ -7069,9 +7068,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.5" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.4" }, - "time": "2023-08-07T12:28:16+00:00" + "time": "2023-07-31T09:39:39+00:00" }, { "name": "spryker-sdk/integrator", From b206d2155b5780472868690fd01f577bbe280370 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:01:09 +0200 Subject: [PATCH 30/53] Fixed composer dependencies. --- composer.lock | 163 ++++++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 79 deletions(-) diff --git a/composer.lock b/composer.lock index 422b3c65..3bbe3ca8 100644 --- a/composer.lock +++ b/composer.lock @@ -3698,29 +3698,29 @@ }, { "name": "laminas/laminas-code", - "version": "4.11.0", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "169123b3ede20a9193480c53de2a8194f8c073ec" + "reference": "91aabc066d5620428120800c0eafc0411e441a62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/169123b3ede20a9193480c53de2a8194f8c073ec", - "reference": "169123b3ede20a9193480c53de2a8194f8c073ec", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/91aabc066d5620428120800c0eafc0411e441a62", + "reference": "91aabc066d5620428120800c0eafc0411e441a62", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": ">=7.4, <8.2" }, "require-dev": { - "doctrine/annotations": "^2.0.0", + "doctrine/annotations": "^1.13.2", "ext-phar": "*", "laminas/laminas-coding-standard": "^2.3.0", "laminas/laminas-stdlib": "^3.6.1", - "phpunit/phpunit": "^10.0.9", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.7.1" + "phpunit/phpunit": "^9.5.10", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.13.1" }, "suggest": { "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", @@ -3728,6 +3728,9 @@ }, "type": "library", "autoload": { + "files": [ + "polyfill/ReflectionEnumPolyfill.php" + ], "psr-4": { "Laminas\\Code\\": "src/" } @@ -3757,26 +3760,26 @@ "type": "community_bridge" } ], - "time": "2023-05-14T12:05:38+00:00" + "time": "2022-11-21T01:32:31+00:00" }, { "name": "laminas/laminas-config", - "version": "3.8.0", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-config.git", - "reference": "46baad58d0b12cf98539e04334eff40a1fdfb9a0" + "reference": "e43d13dcfc273d4392812eb395ce636f73f34dfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-config/zipball/46baad58d0b12cf98539e04334eff40a1fdfb9a0", - "reference": "46baad58d0b12cf98539e04334eff40a1fdfb9a0", + "url": "https://api.github.com/repos/laminas/laminas-config/zipball/e43d13dcfc273d4392812eb395ce636f73f34dfd", + "reference": "e43d13dcfc273d4392812eb395ce636f73f34dfd", "shasum": "" }, "require": { "ext-json": "*", "laminas/laminas-stdlib": "^3.6", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "psr/container": "^1.0" }, "conflict": { @@ -3784,11 +3787,11 @@ "zendframework/zend-config": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-filter": "~2.23.0", - "laminas/laminas-i18n": "~2.19.0", - "laminas/laminas-servicemanager": "~3.19.0", - "phpunit/phpunit": "~9.5.25" + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-filter": "^2.7.2", + "laminas/laminas-i18n": "^2.10.3", + "laminas/laminas-servicemanager": "^3.7", + "phpunit/phpunit": "^9.5.5" }, "suggest": { "laminas/laminas-filter": "^2.7.2; install if you want to use the Filter processor", @@ -3825,41 +3828,42 @@ "type": "community_bridge" } ], - "time": "2022-10-16T14:21:22+00:00" + "time": "2021-10-01T16:07:46+00:00" }, { "name": "laminas/laminas-filter", - "version": "2.32.0", + "version": "2.22.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "2b7e6b2b26a92412c38336ee3089251164edf141" + "reference": "c48e8a392a81de7d211026c078dce0e8bc57e2e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/2b7e6b2b26a92412c38336ee3089251164edf141", - "reference": "2b7e6b2b26a92412c38336ee3089251164edf141", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/c48e8a392a81de7d211026c078dce0e8bc57e2e3", + "reference": "c48e8a392a81de7d211026c078dce0e8bc57e2e3", "shasum": "" }, "require": { "ext-mbstring": "*", - "laminas/laminas-servicemanager": "^3.21.0", + "laminas/laminas-servicemanager": "^3.14.0", "laminas/laminas-stdlib": "^3.13.0", - "php": "~8.1.0 || ~8.2.0" + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "conflict": { "laminas/laminas-validator": "<2.10.1", "zendframework/zend-filter": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-crypt": "^3.10", - "laminas/laminas-uri": "^2.10", + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-crypt": "^3.5.1", + "laminas/laminas-uri": "^2.9.1", "pear/archive_tar": "^1.4.14", - "phpunit/phpunit": "^10.1.3", - "psalm/plugin-phpunit": "^0.18.4", - "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.11" + "phpspec/prophecy-phpunit": "^2.0.1", + "phpunit/phpunit": "^9.5.24", + "psalm/plugin-phpunit": "^0.17.0", + "psr/http-factory": "^1.0.1", + "vimeo/psalm": "^4.27.0" }, "suggest": { "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters", @@ -3903,30 +3907,30 @@ "type": "community_bridge" } ], - "time": "2023-05-16T23:25:05+00:00" + "time": "2022-10-11T08:14:46+00:00" }, { "name": "laminas/laminas-servicemanager", - "version": "3.21.0", + "version": "3.17.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda" + "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/625f2aa3bc6dd02688b2da5155b3a69870812bda", - "reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/360be5f16955dd1edbcce1cfaa98ed82a17f02ec", + "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec", "shasum": "" }, "require": { - "laminas/laminas-stdlib": "^3.17", - "php": "~8.1.0 || ~8.2.0", + "laminas/laminas-stdlib": "^3.2.1", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0", "psr/container": "^1.0" }, "conflict": { "ext-psr": "*", - "laminas/laminas-code": "<4.10.0", + "laminas/laminas-code": "<3.3.1", "zendframework/zend-code": "<3.3.1", "zendframework/zend-servicemanager": "*" }, @@ -3937,20 +3941,20 @@ "container-interop/container-interop": "^1.2.0" }, "require-dev": { - "composer/package-versions-deprecated": "^1.11.99.5", - "friendsofphp/proxy-manager-lts": "^1.0.14", - "laminas/laminas-code": "^4.10.0", - "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-container-config-test": "^0.8", - "laminas/laminas-dependency-plugin": "^2.2", - "mikey179/vfsstream": "^1.6.11", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.17", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8.0" + "composer/package-versions-deprecated": "^1.0", + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-container-config-test": "^0.7", + "laminas/laminas-dependency-plugin": "^2.1.2", + "mikey179/vfsstream": "^1.6.10@alpha", + "ocramius/proxy-manager": "^2.11", + "phpbench/phpbench": "^1.1", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5.5", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.8" }, "suggest": { - "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services" + "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" }, "bin": [ "bin/generate-deps-for-config-factory", @@ -3994,34 +3998,35 @@ "type": "community_bridge" } ], - "time": "2023-05-14T12:24:54+00:00" + "time": "2022-09-22T11:33:46+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.17.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "dd35c868075bad80b6718959740913e178eb4274" + "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/dd35c868075bad80b6718959740913e178eb4274", - "reference": "dd35c868075bad80b6718959740913e178eb4274", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/66a6d03c381f6c9f1dd988bf8244f9afb9380d76", + "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.16", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8" + "laminas/laminas-coding-standard": "~2.3.0", + "phpbench/phpbench": "^1.2.6", + "phpstan/phpdoc-parser": "^0.5.4", + "phpunit/phpunit": "^9.5.23", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.26" }, "type": "library", "autoload": { @@ -4053,7 +4058,7 @@ "type": "community_bridge" } ], - "time": "2023-03-20T13:51:37+00:00" + "time": "2022-08-24T13:56:50+00:00" }, { "name": "m4tthumphrey/php-gitlab-api", @@ -7000,16 +7005,16 @@ }, { "name": "spryker-sdk/evaluator", - "version": "0.1.4", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3" + "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", - "reference": "d0d9fe4e4ec03966d356a4d1c482b55c239bf2c3", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/1acb655209157b309e58e8f79dfd6a2be93e901a", + "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a", "shasum": "" }, "require": { @@ -7018,6 +7023,7 @@ "ext-iconv": "*", "ext-json": "*", "guzzlehttp/guzzle": "^7.5", + "laminas/laminas-filter": "^2.11.0", "php": ">=7.4", "spryker-sdk/security-checker": "^0.2.0", "symfony/console": "^5.4|^6.0", @@ -7078,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "a1873627f619b87f245496663439f31d4090a48c" + "reference": "be837683956a099d6ac1c79e68552f2747311b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/a1873627f619b87f245496663439f31d4090a48c", - "reference": "a1873627f619b87f245496663439f31d4090a48c", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/be837683956a099d6ac1c79e68552f2747311b5d", + "reference": "be837683956a099d6ac1c79e68552f2747311b5d", "shasum": "" }, "require": { @@ -7133,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-09T07:19:39+00:00" + "time": "2023-08-02T11:30:28+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7328,16 +7334,15 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6" + "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", - "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/750fc847e8f99771e1e7676a7bd88f3bb39d1014", + "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014", "shasum": "" }, "require": { - "composer/semver": "^3.3", "davidrjonas/composer-lock-diff": "^1.6", "ergebnis/json-printer": "^3.1", "ext-json": "*", @@ -7395,7 +7400,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-07T09:03:48+00:00" + "time": "2023-08-02T11:34:54+00:00" }, { "name": "spryker/architecture-sniffer", From ed267e155cb3a890ee5cd10b5c503fee1626d718 Mon Sep 17 00:00:00 2001 From: Sergey <100715007+sergeyspryker@users.noreply.github.com> Date: Wed, 9 Aug 2023 15:11:48 +0300 Subject: [PATCH 31/53] SDK-4403: Fix security output (#432) Co-authored-by: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> --- src/Presentation/Console/Resources/config/services.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/Console/Resources/config/services.yaml b/src/Presentation/Console/Resources/config/services.yaml index 41b958f5..d1717e3e 100644 --- a/src/Presentation/Console/Resources/config/services.yaml +++ b/src/Presentation/Console/Resources/config/services.yaml @@ -149,7 +149,7 @@ services: # Integrations security_checker_command: class: SecurityChecker\Command\SecurityCheckerCommand - tags: ["console.command", "telemetry.observable_command"] + tags: ["console.command"] composer_replace_command: class: SprykerSdk\Zed\ComposerReplace\Communication\Console\ComposerReplaceConsole tags: [ "console.command", "telemetry.observable_command"] From 1ea9e1f6084e26d7397941357e4af40462acb1ca Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Wed, 9 Aug 2023 14:39:40 +0200 Subject: [PATCH 32/53] Update upgrader and integrator --- composer.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 3bbe3ca8..f533cf42 100644 --- a/composer.lock +++ b/composer.lock @@ -7074,9 +7074,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.4" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.5" }, - "time": "2023-07-31T09:39:39+00:00" + "time": "2023-08-07T12:28:16+00:00" }, { "name": "spryker-sdk/integrator", @@ -7334,15 +7334,16 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014" + "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/750fc847e8f99771e1e7676a7bd88f3bb39d1014", - "reference": "750fc847e8f99771e1e7676a7bd88f3bb39d1014", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", + "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", "shasum": "" }, "require": { + "composer/semver": "^3.3", "davidrjonas/composer-lock-diff": "^1.6", "ergebnis/json-printer": "^3.1", "ext-json": "*", @@ -7400,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-02T11:34:54+00:00" + "time": "2023-08-07T09:03:48+00:00" }, { "name": "spryker/architecture-sniffer", From eabccab77639272872ee8f0ef39fbcd19aca95e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:19:56 +0200 Subject: [PATCH 33/53] Updated upgrader and integrator (#436) --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index f533cf42..bb300bc8 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "be837683956a099d6ac1c79e68552f2747311b5d" + "reference": "b6c65b1800c516fd304bc113e9186e981ee5b979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/be837683956a099d6ac1c79e68552f2747311b5d", - "reference": "be837683956a099d6ac1c79e68552f2747311b5d", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/b6c65b1800c516fd304bc113e9186e981ee5b979", + "reference": "b6c65b1800c516fd304bc113e9186e981ee5b979", "shasum": "" }, "require": { @@ -7139,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-02T11:30:28+00:00" + "time": "2023-08-16T13:20:27+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7334,12 +7334,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6" + "reference": "64e2b7f12d17334b534ed0288c174b6bf8481852" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", - "reference": "ff9f1e7fdb8b6c33596adfda800c3c819aa124b6", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/64e2b7f12d17334b534ed0288c174b6bf8481852", + "reference": "64e2b7f12d17334b534ed0288c174b6bf8481852", "shasum": "" }, "require": { @@ -7401,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-07T09:03:48+00:00" + "time": "2023-08-16T13:21:59+00:00" }, { "name": "spryker/architecture-sniffer", From f25ce7ed11c08d1537b46bb6e8a69780bff7c64f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:39:55 +0200 Subject: [PATCH 34/53] Updated spryker-sdk/integrator dependency (#439) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index bb300bc8..b5186d4d 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "b6c65b1800c516fd304bc113e9186e981ee5b979" + "reference": "e056385d658ddf5701b4745971b160540b3adc2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/b6c65b1800c516fd304bc113e9186e981ee5b979", - "reference": "b6c65b1800c516fd304bc113e9186e981ee5b979", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/e056385d658ddf5701b4745971b160540b3adc2d", + "reference": "e056385d658ddf5701b4745971b160540b3adc2d", "shasum": "" }, "require": { @@ -7139,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-16T13:20:27+00:00" + "time": "2023-08-18T10:35:05+00:00" }, { "name": "spryker-sdk/sdk-contracts", From c6a466cc234ea0d0c6f57b5a2e662c52326e675b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:42:31 +0200 Subject: [PATCH 35/53] Updated spryker-sdk/upgrader dependency (#440) Co-authored-by: pavelmaksimov25 --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index b5186d4d..427e2617 100644 --- a/composer.lock +++ b/composer.lock @@ -7334,12 +7334,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "64e2b7f12d17334b534ed0288c174b6bf8481852" + "reference": "8e3bbeefa66c8a56730e83b06c8d3dfc4583ae6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/64e2b7f12d17334b534ed0288c174b6bf8481852", - "reference": "64e2b7f12d17334b534ed0288c174b6bf8481852", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/8e3bbeefa66c8a56730e83b06c8d3dfc4583ae6a", + "reference": "8e3bbeefa66c8a56730e83b06c8d3dfc4583ae6a", "shasum": "" }, "require": { @@ -7401,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-16T13:21:59+00:00" + "time": "2023-08-18T10:40:24+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16085,8 +16085,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From 40003c7a2588bc2d5766b8e34724d748e0c70001 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 17:08:58 +0200 Subject: [PATCH 36/53] Updated spryker-sdk/integrator dependency (#441) --- composer.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 427e2617..31d77e98 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "e056385d658ddf5701b4745971b160540b3adc2d" + "reference": "2828f1dbc03af7eac45a49148e2cd97f010e00f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/e056385d658ddf5701b4745971b160540b3adc2d", - "reference": "e056385d658ddf5701b4745971b160540b3adc2d", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/2828f1dbc03af7eac45a49148e2cd97f010e00f1", + "reference": "2828f1dbc03af7eac45a49148e2cd97f010e00f1", "shasum": "" }, "require": { @@ -7139,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-18T10:35:05+00:00" + "time": "2023-08-18T15:05:56+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -16085,7 +16085,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From bbb48db9e6cc9f0cff152d0657b349744a2f9f23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:37:09 +0200 Subject: [PATCH 37/53] Updated spryker-sdk/upgrader dependency (#442) Co-authored-by: pavelmaksimov25 --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 31d77e98..7c2c9cc3 100644 --- a/composer.lock +++ b/composer.lock @@ -7334,12 +7334,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "8e3bbeefa66c8a56730e83b06c8d3dfc4583ae6a" + "reference": "a143281d4951139714c686dc94e0f293b23e3ccc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/8e3bbeefa66c8a56730e83b06c8d3dfc4583ae6a", - "reference": "8e3bbeefa66c8a56730e83b06c8d3dfc4583ae6a", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/a143281d4951139714c686dc94e0f293b23e3ccc", + "reference": "a143281d4951139714c686dc94e0f293b23e3ccc", "shasum": "" }, "require": { @@ -7401,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-18T10:40:24+00:00" + "time": "2023-08-18T15:09:30+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16085,8 +16085,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From 6f24876a388013a71e7fceba1c7e252ffc46436f Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Tue, 22 Aug 2023 16:07:30 +0200 Subject: [PATCH 38/53] Update upgrader and integrator --- composer.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 7c2c9cc3..469515ba 100644 --- a/composer.lock +++ b/composer.lock @@ -16085,7 +16085,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From 04829de50da69fdbc61bbc4f736dc45a078d9deb Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Wed, 23 Aug 2023 09:32:42 +0200 Subject: [PATCH 39/53] SDK-4012: Introduced buddyci pipeline config for the upgrader. --- .../buddyci.pipeline.upgrader-pre-release.yml | 262 ++++++++++++++++++ 1 file changed, 262 insertions(+) create mode 100644 infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml diff --git a/infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml b/infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml new file mode 100644 index 00000000..daa29e4f --- /dev/null +++ b/infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml @@ -0,0 +1,262 @@ +- pipeline: "Upgrader Pre-Release " + events: + - type: "PUSH" + refs: + - "refs/heads/rc" + priority: "LOW" + terminate_stale_runs: true + auto_clear_cache: true + fail_on_prepare_env_warning: true + variables: + - key: "GITHUB_TOKEN" + value: "secure!lifFbTk9QlCr191sBzpx4KIZkBNwWx/90del0UAlelDR0GWW9Y8+XOUMALIrqsf7.W4VCKPKPwKz6UdZjiUPlhg==" + type: "VAR" + encrypted: true + - key: "ORGANIZATION_NAME" + value: "pavelmaksimov25" + type: "VAR" + - key: "PROJECT_PATH" + value: "project" + type: "VAR" + - key: "PROJECT_REPO" + value: "https://github.com/pavelmaksimov25/b2b-demo-shop" + type: "VAR" + - key: "REPOSITORY_NAME" + value: "b2b-demo-shop" + type: "VAR" + - key: "TOOL_REPOSITORY_CLEANER_GIT_URL" + value: "https://github.com/pavelmaksimov25/repo-cleaner.git" + type: "VAR" + - key: "TOOL_REPOSITORY_CLEANER_LOCAL_PATH" + value: "repo_cleaner" + type: "VAR" + actions: + - action: "Build and push SDK image" + type: "DOCKERFILE" + docker_image_tag: "alpha-80" + dockerfile_path: "./infrastructure/sdk.sprykerci80.Dockerfile" + context_path: "." + repository: "luckyj/upgrader-php" + do_not_prune_images: true + integration_hash: "L39J4q2VolejOpAPajNmGQBW71" + - action: "Clone Demo Shop project" + type: "GIT_HUB_CLI" + execute_commands: + - "gh repo clone \"$PROJECT_REPO\" \"$PROJECT_PATH\"" + shell: "BASH" + integration_hash: "rG7YBDXMVyb8BQXgevAZEJ24gN" + - action: "Clean up Demo Shop repository" + type: "BUILD" + docker_image_name: "library/php" + docker_image_tag: "8.2.8" + execute_commands: + - "" + - "DIR=\"$TOOL_REPOSITORY_CLEANER_LOCAL_PATH\"" + - "[ ! -d \"$DIR\" ] && git clone $TOOL_REPOSITORY_CLEANER_GIT_URL \"$DIR\"" + - "" + - "cd \"$DIR\"" + - "" + - "composer install" + - "" + - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + setup_commands: + - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" + - "apt-get update && apt-get install -y git zip" + - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" + - "" + - "# php ext gd" + - "apt-get install -y libfreetype6-dev" + - "apt-get install -y libjpeg62-turbo-dev" + - "apt-get install -y libpng-dev" + - "docker-php-ext-configure gd --with-freetype --with-jpeg" + - "docker-php-ext-install gd" + - "" + - "# php ext pdo_mysql" + - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" + - "docker-php-ext-install pdo_mysql" + - "" + - "# php ext zip" + - "apt-get install -y zip" + - "apt-get install -y unzip" + - "apt-get install -y zlib1g-dev" + - "apt-get install -y libzip-dev" + - "docker-php-ext-install zip" + ignore_errors: true + shell: "BASH" + variables: + - key: "ORGANIZATION_NAME" + value: "pavelmaksimov25" + type: "VAR" + settable: true + - key: "REPOSITORY_NAME" + value: "b2b-demo-shop" + type: "VAR" + settable: true + timeout: 180 + - action: "Build and Run Upgrader" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "SOURCE_CODE_PROVIDER=\"github\"" + - "COMPOSER_GLOBAL_CMD=\"\"" + - "SOURCE_CODE_PROVIDER_URL=\"\"" + - "" + - "ACCESS_TOKEN=\"$GITHUB_TOKEN\"" + - "REPO_URL_ENDING=\".git\"" + - "COMPOSER_GLOBAL_CMD=\"composer global config -g github-oauth.github.com ${ACCESS_TOKEN}\"" + - "PROJECT_NAME=\"\"" + - "" + - "docker pull spryker/php-sdk:sprykerci" + - "" + - "cd \"$PROJECT_PATH\"" + - "git remote set-url origin https://${ORGANIZATION_NAME}:${ACCESS_TOKEN}@github.com/${ORGANIZATION_NAME}/${REPOSITORY_NAME}.git" + - "cd .." + - "" + - "docker run -u spryker --rm -v ${PWD}/\"$PROJECT_PATH\":/data/project \\" + - "-e ACCESS_TOKEN=${ACCESS_TOKEN} \\" + - "-e ORGANIZATION_NAME=${ORGANIZATION_NAME} \\" + - "-e REPOSITORY_NAME=${REPOSITORY_NAME} \\" + - "-e SOURCE_CODE_PROVIDER=${SOURCE_CODE_PROVIDER} \\" + - "-e SOURCE_CODE_PROVIDER_URL=\"${SOURCE_CODE_PROVIDER_URL}\" \\" + - "-e COMPOSER_GLOBAL_CMD=\"${COMPOSER_GLOBAL_CMD}\" \\" + - "-e PROJECT_NAME=\"${PROJECT_NAME}\" \\" + - "-e UPGRADE_STRATEGY=release-app \\" + - "-e INTEGRATOR_ENABLED=true \\" + - "-e EVALUATOR_ENABLED=true \\" + - "-e REPORTING_ENABLED=false \\" + - "-e REPORT_SEND_AUTH_TOKEN=\"\" \\" + - "-e NEWRELIC_ENABLED=false \\" + - "-e NEWRELIC_LICENSE=\"\" \\" + - "-e NEWRELIC_APPNAME=\"\" \\" + - "-e NEWRELIC_LOGLEVEL=\"\" \\" + - "-e RELEASE_GROUP_ID=\"\" \\" + - "-e APP_ENV=\"sprykerci\" \\" + - "spryker/php-sdk:sprykerci 'git config --global user.email upgrader@spryker.com " + - "&& git config --global user.name \"upgrader\" " + - "&& $COMPOSER_GLOBAL_CMD" + - "&& echo \"$COMPOSER_GLOBAL_CMD\"" + - "&& cd /data/project" + - "&& ls -lha" + - "&& composer install --no-scripts " + - "&& ((git branch -D `git branch | grep -E \"upgradebot\\/\"` > /dev/null 2>&1) || true) " + - "&& /data/bin/console upgradability:php:upgrade -vvv'" + variables: + - key: "ACCESS_TOKEN" + value: "secure!lifFbTk9QlCr191sBzpx4KIZkBNwWx/90del0UAlelDR0GWW9Y8+XOUMALIrqsf7.W4VCKPKPwKz6UdZjiUPlhg==" + type: "VAR" + encrypted: true + - key: "SOURCE_CODE_PROVIDER" + value: "github" + type: "VAR" + docker_layer_caching_scope: "ACTION" + instance_type: "GENERAL_MEDIUM" + - action: "Check is PR created" + type: "GIT_HUB_CLI" + execute_commands: + - "PRS_CNT=$(gh search prs --owner=\"$ORGANIZATION_NAME\" --repo=\"$REPOSITORY_NAME\" --state=open --json title --jq='.[] | select(.title | test(\"^Auto-updating Spryker modules on+\", \"g\"))' | wc -l)" + - " " + - "if [ \"$PRS_CNT\" -eq 0 ]" + - "then" + - " echo 'Test is failed: Open PR is not found.'" + - " exit 1" + - "fi" + - "" + - "echo 'Test passed: Open PR is detected.'" + shell: "BASH" + integration_hash: "Nz7x3VXyMYerMAg4dOBQn6LlRG" + - action: "Clean up Demo Shop repository" + type: "BUILD" + docker_image_name: "library/php" + docker_image_tag: "8.2.8" + execute_commands: + - "" + - "DIR=\"$TOOL_REPOSITORY_CLEANER_LOCAL_PATH\"" + - "[ ! -d \"$DIR\" ] && git clone $TOOL_REPOSITORY_CLEANER_GIT_URL \"$DIR\"" + - "" + - "cd \"$DIR\"" + - "" + - "composer install" + - "" + - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + setup_commands: + - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" + - "apt-get update && apt-get install -y git zip" + - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" + - "" + - "# php ext gd" + - "apt-get install -y libfreetype6-dev" + - "apt-get install -y libjpeg62-turbo-dev" + - "apt-get install -y libpng-dev" + - "docker-php-ext-configure gd --with-freetype --with-jpeg" + - "docker-php-ext-install gd" + - "" + - "# php ext pdo_mysql" + - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" + - "docker-php-ext-install pdo_mysql" + - "" + - "# php ext zip" + - "apt-get install -y zip" + - "apt-get install -y unzip" + - "apt-get install -y zlib1g-dev" + - "apt-get install -y libzip-dev" + - "docker-php-ext-install zip" + ignore_errors: true + shell: "BASH" + variables: + - key: "ORGANIZATION_NAME" + value: "pavelmaksimov25" + type: "VAR" + settable: true + - key: "REPOSITORY_NAME" + value: "b2b-demo-shop" + type: "VAR" + settable: true + timeout: 180 + - action: "Clear cache" + type: "CLEAR_CACHE" + cache_types: + - "DOCKER" + - "FILE_SYSTEM" + - "SERVICES" + - "ADDITIONAL" + - "DOCKER_CLI" + - action: "Execute php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + type: "BUILD" + trigger_time: "ON_FAILURE" + docker_image_name: "library/php" + docker_image_tag: "8.2.9" + execute_commands: + - "git clone https://github.com/pavelmaksimov25/repo-cleaner.git repo_cleaner" + - "" + - "cd repo_cleaner" + - "" + - "composer install" + - "" + - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + setup_commands: + - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" + - "apt-get update && apt-get install -y git zip" + - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" + - "" + - "# php ext gd" + - "apt-get install -y libfreetype6-dev" + - "apt-get install -y libjpeg62-turbo-dev" + - "apt-get install -y libpng-dev" + - "docker-php-ext-configure gd --with-freetype --with-jpeg" + - "docker-php-ext-install gd" + - "" + - "# php ext pdo_mysql" + - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" + - "docker-php-ext-install pdo_mysql" + - "" + - "# php ext zip" + - "apt-get install -y zip" + - "apt-get install -y unzip" + - "apt-get install -y zlib1g-dev" + - "apt-get install -y libzip-dev" + - "docker-php-ext-install zip" + shell: "BASH" + - action: "Clear cache" + type: "CLEAR_CACHE" + trigger_time: "ON_FAILURE" + cache_types: + - "FILE_SYSTEM" From 80d8bd8b6bae54ab1c261a79a90566cc825aeef2 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:30:12 +0200 Subject: [PATCH 40/53] SDK-4012: Introduced buddyci project config for the sdk and upgrader. --- ...ader-pre-release.yml => sdk-pipelines.yml} | 143 +++++++++++++++++- 1 file changed, 140 insertions(+), 3 deletions(-) rename infrastructure/buddyci/{buddyci.pipeline.upgrader-pre-release.yml => sdk-pipelines.yml} (54%) diff --git a/infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml b/infrastructure/buddyci/sdk-pipelines.yml similarity index 54% rename from infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml rename to infrastructure/buddyci/sdk-pipelines.yml index daa29e4f..6cf31bca 100644 --- a/infrastructure/buddyci/buddyci.pipeline.upgrader-pre-release.yml +++ b/infrastructure/buddyci/sdk-pipelines.yml @@ -1,9 +1,76 @@ +- pipeline: "SDK post-deploy" + events: + - type: "CREATE_REF" + refs: + - ":default" + always_from_scratch: true + terminate_stale_runs: true + auto_clear_cache: true + fail_on_prepare_env_warning: true + variables: + - key: "GH_TOKEN" + value: "secure!8Th+XRNi+x0E4/q+trynssaoyPpWo/M9Z0OZL0qmDGqRGYh9mrScQ8JoOH6AImpI.A3YcoiZ8nLUIolQeEYBWAA==" + type: "VAR" + encrypted: true + - key: "GH_USER" + value: "pavelmaksymov25" + type: "VAR" + settable: true + actions: + - action: "Install SDK" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "rm -rf spryker-sdk && mkdir spryker-sdk \\" + - "&& cd spryker-sdk \\" + - "&& export PATH_TO_SDK=$(pwd) \\" + - "&& echo $PATH_TO_SDK \\" + - "&& curl -fL github.com/spryker-sdk/sdk/releases/latest/download/installer.sh -O \\" + - "&& chmod +x installer.sh \\" + - "&& ./installer.sh \"${PATH_TO_SDK}\" \\" + - "&& rm -f installer.sh \\" + - "&& echo \"Current SDK version: $($PATH_TO_SDK/bin/spryker-sdk.sh --version)\" \\" + - "&& $PATH_TO_SDK/bin/spryker-sdk.sh" + docker_layer_caching_scope: "ACTION" + - action: "Install B2C" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "sudo rm -rf spryker-b2c && mkdir spryker-b2c && cd spryker-b2c \\" + - "&& export GITHUB_TOKEN=${GH_TOKEN} \\" + - "&& export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"'${GH_TOKEN}'\"}}' \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker-shop/b2c-demo-shop.git ./ \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker/docker-sdk.git docker \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" scheduler:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" mail_catcher:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" redis-gui:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" dashboard:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& docker/sdk boot deploy.dev.yml \\" + - "&& sed -i 's/- \"80:80\"/- \"8888:80\"/g' docker/deployment/default/docker-compose.yml \\" + - "&& docker/sdk up --build \\" + - "&& docker/sdk down" + - "" + timeout: 5400 + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true + - action: "Make jobs" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "export SDK_CI_EXECUTION=1 \\" + - "&& cd spryker-b2c && rm -rf .ssdk \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:init:project --qa_tasks=validation:php:codestyle-check --workflow=hello_php -q \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:qa:run --path=src \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle-check --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php:staged_set --foo=FOO --bar=BAR -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:workflow:run hello_php -n -vvv" + - "" + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true - pipeline: "Upgrader Pre-Release " events: - type: "PUSH" refs: - "refs/heads/rc" - priority: "LOW" terminate_stale_runs: true auto_clear_cache: true fail_on_prepare_env_warning: true @@ -135,7 +202,6 @@ - "&& $COMPOSER_GLOBAL_CMD" - "&& echo \"$COMPOSER_GLOBAL_CMD\"" - "&& cd /data/project" - - "&& ls -lha" - "&& composer install --no-scripts " - "&& ((git branch -D `git branch | grep -E \"upgradebot\\/\"` > /dev/null 2>&1) || true) " - "&& /data/bin/console upgradability:php:upgrade -vvv'" @@ -156,7 +222,7 @@ - " " - "if [ \"$PRS_CNT\" -eq 0 ]" - "then" - - " echo 'Test is failed: Open PR is not found.'" + - " echo 'Test failed: Open PR is not found.'" - " exit 1" - "fi" - "" @@ -260,3 +326,74 @@ trigger_time: "ON_FAILURE" cache_types: - "FILE_SYSTEM" +- pipeline: "SDK Pre-Release Smoke Tests" + events: + - type: "CREATE_REF" + refs: + - "refs/heads/rc" + always_from_scratch: true + terminate_stale_runs: true + auto_clear_cache: true + variables: + - key: "GH_TOKEN" + value: "secure!8Th+XRNi+x0E4/q+trynssaoyPpWo/M9Z0OZL0qmDGqRGYh9mrScQ8JoOH6AImpI.A3YcoiZ8nLUIolQeEYBWAA==" + type: "VAR" + encrypted: true + - key: "GH_USER" + value: "pavelmaksymov25" + type: "VAR" + settable: true + change_set_base: "LATEST_RUN_MATCHING_REF" + actions: + - action: "Install SDK" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "rm -rf spryker-sdk; mkdir spryker-sdk \\" + - "&& cd spryker-sdk \\" + - "&& export PATH_TO_SDK=$(pwd) \\" + - "&& echo $PATH_TO_SDK \\" + - "&& curl -fL github.com/spryker-sdk/sdk/releases/latest/download/installer.sh -O \\" + - "&& chmod +x installer.sh \\" + - "&& ./installer.sh \"${PATH_TO_SDK}\" \\" + - "&& rm -f installer.sh \\" + - "&& echo \"Current SDK version: $($PATH_TO_SDK/bin/spryker-sdk.sh --version)\" \\" + - "&& $PATH_TO_SDK/bin/spryker-sdk.sh" + docker_layer_caching_scope: "ACTION" + instance_type: "GENERAL_MEDIUM" + - action: "Install B2C" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "sudo rm -rf spryker-b2c && mkdir spryker-b2c && cd spryker-b2c \\" + - "&& export GITHUB_TOKEN=${GH_TOKEN} \\" + - "&& export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"'${GH_TOKEN}'\"}}' \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker-shop/b2c-demo-shop.git ./ \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker/docker-sdk.git docker \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" scheduler:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" mail_catcher:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" redis-gui:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" dashboard:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& docker/sdk boot deploy.dev.yml \\" + - "&& sed -i 's/- \"80:80\"/- \"8888:80\"/g' docker/deployment/default/docker-compose.yml \\" + - "&& docker/sdk up --build \\" + - "&& docker/sdk down" + - "" + timeout: 5400 + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true + instance_type: "GENERAL_MEDIUM" + - action: "Run tasks" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "export SDK_CI_EXECUTION=1 \\" + - "&& cd spryker-b2c && rm -rf .ssdk \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:init:project --qa_tasks=validation:php:codestyle-check --workflow=hello_php -q \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:qa:run --path=src \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle-check --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php:staged_set --foo=FOO --bar=BAR -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:workflow:run hello_php -n -vvv" + - "" + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true + instance_type: "GENERAL_MEDIUM" From d752eee456b308c99a844f913e005f3482ee8db3 Mon Sep 17 00:00:00 2001 From: Pavel Maksimov <82393959+pavelmaksimov25@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:36:52 +0200 Subject: [PATCH 41/53] SDK-4012: Adjusted buddyci project config for the sdk and upgrader. --- infrastructure/buddyci/sdk-pipelines.yml | 792 +++++++++++------------ 1 file changed, 396 insertions(+), 396 deletions(-) diff --git a/infrastructure/buddyci/sdk-pipelines.yml b/infrastructure/buddyci/sdk-pipelines.yml index 6cf31bca..f3ccd33f 100644 --- a/infrastructure/buddyci/sdk-pipelines.yml +++ b/infrastructure/buddyci/sdk-pipelines.yml @@ -1,399 +1,399 @@ -- pipeline: "SDK post-deploy" - events: - - type: "CREATE_REF" - refs: - - ":default" - always_from_scratch: true - terminate_stale_runs: true - auto_clear_cache: true - fail_on_prepare_env_warning: true - variables: - - key: "GH_TOKEN" - value: "secure!8Th+XRNi+x0E4/q+trynssaoyPpWo/M9Z0OZL0qmDGqRGYh9mrScQ8JoOH6AImpI.A3YcoiZ8nLUIolQeEYBWAA==" - type: "VAR" - encrypted: true - - key: "GH_USER" - value: "pavelmaksymov25" - type: "VAR" - settable: true - actions: - - action: "Install SDK" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "rm -rf spryker-sdk && mkdir spryker-sdk \\" - - "&& cd spryker-sdk \\" - - "&& export PATH_TO_SDK=$(pwd) \\" - - "&& echo $PATH_TO_SDK \\" - - "&& curl -fL github.com/spryker-sdk/sdk/releases/latest/download/installer.sh -O \\" - - "&& chmod +x installer.sh \\" - - "&& ./installer.sh \"${PATH_TO_SDK}\" \\" - - "&& rm -f installer.sh \\" - - "&& echo \"Current SDK version: $($PATH_TO_SDK/bin/spryker-sdk.sh --version)\" \\" - - "&& $PATH_TO_SDK/bin/spryker-sdk.sh" - docker_layer_caching_scope: "ACTION" - - action: "Install B2C" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "sudo rm -rf spryker-b2c && mkdir spryker-b2c && cd spryker-b2c \\" - - "&& export GITHUB_TOKEN=${GH_TOKEN} \\" - - "&& export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"'${GH_TOKEN}'\"}}' \\" - - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker-shop/b2c-demo-shop.git ./ \\" - - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker/docker-sdk.git docker \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" scheduler:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" mail_catcher:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" redis-gui:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" dashboard:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& docker/sdk boot deploy.dev.yml \\" - - "&& sed -i 's/- \"80:80\"/- \"8888:80\"/g' docker/deployment/default/docker-compose.yml \\" - - "&& docker/sdk up --build \\" - - "&& docker/sdk down" - - "" - timeout: 5400 - docker_layer_caching_scope: "ACTION" - vm_from_prev_action: true - - action: "Make jobs" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "export SDK_CI_EXECUTION=1 \\" - - "&& cd spryker-b2c && rm -rf .ssdk \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:init:project --qa_tasks=validation:php:codestyle-check --workflow=hello_php -q \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:qa:run --path=src \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle-check --path=src -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php:staged_set --foo=FOO --bar=BAR -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle --path=src -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:workflow:run hello_php -n -vvv" - - "" - docker_layer_caching_scope: "ACTION" - vm_from_prev_action: true -- pipeline: "Upgrader Pre-Release " - events: - - type: "PUSH" - refs: - - "refs/heads/rc" - terminate_stale_runs: true - auto_clear_cache: true - fail_on_prepare_env_warning: true - variables: - - key: "GITHUB_TOKEN" - value: "secure!lifFbTk9QlCr191sBzpx4KIZkBNwWx/90del0UAlelDR0GWW9Y8+XOUMALIrqsf7.W4VCKPKPwKz6UdZjiUPlhg==" - type: "VAR" - encrypted: true - - key: "ORGANIZATION_NAME" - value: "pavelmaksimov25" - type: "VAR" - - key: "PROJECT_PATH" - value: "project" - type: "VAR" - - key: "PROJECT_REPO" - value: "https://github.com/pavelmaksimov25/b2b-demo-shop" - type: "VAR" - - key: "REPOSITORY_NAME" - value: "b2b-demo-shop" - type: "VAR" - - key: "TOOL_REPOSITORY_CLEANER_GIT_URL" - value: "https://github.com/pavelmaksimov25/repo-cleaner.git" - type: "VAR" - - key: "TOOL_REPOSITORY_CLEANER_LOCAL_PATH" - value: "repo_cleaner" - type: "VAR" - actions: - - action: "Build and push SDK image" - type: "DOCKERFILE" - docker_image_tag: "alpha-80" - dockerfile_path: "./infrastructure/sdk.sprykerci80.Dockerfile" - context_path: "." - repository: "luckyj/upgrader-php" - do_not_prune_images: true - integration_hash: "L39J4q2VolejOpAPajNmGQBW71" - - action: "Clone Demo Shop project" - type: "GIT_HUB_CLI" - execute_commands: - - "gh repo clone \"$PROJECT_REPO\" \"$PROJECT_PATH\"" - shell: "BASH" - integration_hash: "rG7YBDXMVyb8BQXgevAZEJ24gN" - - action: "Clean up Demo Shop repository" - type: "BUILD" - docker_image_name: "library/php" - docker_image_tag: "8.2.8" - execute_commands: - - "" - - "DIR=\"$TOOL_REPOSITORY_CLEANER_LOCAL_PATH\"" - - "[ ! -d \"$DIR\" ] && git clone $TOOL_REPOSITORY_CLEANER_GIT_URL \"$DIR\"" - - "" - - "cd \"$DIR\"" - - "" - - "composer install" - - "" - - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" - setup_commands: - - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" - - "apt-get update && apt-get install -y git zip" - - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" - - "" - - "# php ext gd" - - "apt-get install -y libfreetype6-dev" - - "apt-get install -y libjpeg62-turbo-dev" - - "apt-get install -y libpng-dev" - - "docker-php-ext-configure gd --with-freetype --with-jpeg" - - "docker-php-ext-install gd" - - "" - - "# php ext pdo_mysql" - - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" - - "docker-php-ext-install pdo_mysql" - - "" - - "# php ext zip" - - "apt-get install -y zip" - - "apt-get install -y unzip" - - "apt-get install -y zlib1g-dev" - - "apt-get install -y libzip-dev" - - "docker-php-ext-install zip" - ignore_errors: true - shell: "BASH" +- pipeline: "SDK post-deploy" + events: + - type: "CREATE_REF" + refs: + - ":default" + always_from_scratch: true + terminate_stale_runs: true + auto_clear_cache: true + fail_on_prepare_env_warning: true variables: - - key: "ORGANIZATION_NAME" - value: "pavelmaksimov25" - type: "VAR" - settable: true - - key: "REPOSITORY_NAME" - value: "b2b-demo-shop" - type: "VAR" - settable: true - timeout: 180 - - action: "Build and Run Upgrader" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "SOURCE_CODE_PROVIDER=\"github\"" - - "COMPOSER_GLOBAL_CMD=\"\"" - - "SOURCE_CODE_PROVIDER_URL=\"\"" - - "" - - "ACCESS_TOKEN=\"$GITHUB_TOKEN\"" - - "REPO_URL_ENDING=\".git\"" - - "COMPOSER_GLOBAL_CMD=\"composer global config -g github-oauth.github.com ${ACCESS_TOKEN}\"" - - "PROJECT_NAME=\"\"" - - "" - - "docker pull spryker/php-sdk:sprykerci" - - "" - - "cd \"$PROJECT_PATH\"" - - "git remote set-url origin https://${ORGANIZATION_NAME}:${ACCESS_TOKEN}@github.com/${ORGANIZATION_NAME}/${REPOSITORY_NAME}.git" - - "cd .." - - "" - - "docker run -u spryker --rm -v ${PWD}/\"$PROJECT_PATH\":/data/project \\" - - "-e ACCESS_TOKEN=${ACCESS_TOKEN} \\" - - "-e ORGANIZATION_NAME=${ORGANIZATION_NAME} \\" - - "-e REPOSITORY_NAME=${REPOSITORY_NAME} \\" - - "-e SOURCE_CODE_PROVIDER=${SOURCE_CODE_PROVIDER} \\" - - "-e SOURCE_CODE_PROVIDER_URL=\"${SOURCE_CODE_PROVIDER_URL}\" \\" - - "-e COMPOSER_GLOBAL_CMD=\"${COMPOSER_GLOBAL_CMD}\" \\" - - "-e PROJECT_NAME=\"${PROJECT_NAME}\" \\" - - "-e UPGRADE_STRATEGY=release-app \\" - - "-e INTEGRATOR_ENABLED=true \\" - - "-e EVALUATOR_ENABLED=true \\" - - "-e REPORTING_ENABLED=false \\" - - "-e REPORT_SEND_AUTH_TOKEN=\"\" \\" - - "-e NEWRELIC_ENABLED=false \\" - - "-e NEWRELIC_LICENSE=\"\" \\" - - "-e NEWRELIC_APPNAME=\"\" \\" - - "-e NEWRELIC_LOGLEVEL=\"\" \\" - - "-e RELEASE_GROUP_ID=\"\" \\" - - "-e APP_ENV=\"sprykerci\" \\" - - "spryker/php-sdk:sprykerci 'git config --global user.email upgrader@spryker.com " - - "&& git config --global user.name \"upgrader\" " - - "&& $COMPOSER_GLOBAL_CMD" - - "&& echo \"$COMPOSER_GLOBAL_CMD\"" - - "&& cd /data/project" - - "&& composer install --no-scripts " - - "&& ((git branch -D `git branch | grep -E \"upgradebot\\/\"` > /dev/null 2>&1) || true) " - - "&& /data/bin/console upgradability:php:upgrade -vvv'" + - key: "GH_TOKEN" + value: "secure!8Th+XRNi+x0E4/q+trynssaoyPpWo/M9Z0OZL0qmDGqRGYh9mrScQ8JoOH6AImpI.A3YcoiZ8nLUIolQeEYBWAA==" + type: "VAR" + encrypted: true + - key: "GH_USER" + value: "pavelmaksymov25" + type: "VAR" + settable: true + actions: + - action: "Install SDK" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "rm -rf spryker-sdk && mkdir spryker-sdk \\" + - "&& cd spryker-sdk \\" + - "&& export PATH_TO_SDK=$(pwd) \\" + - "&& echo $PATH_TO_SDK \\" + - "&& curl -fL github.com/spryker-sdk/sdk/releases/latest/download/installer.sh -O \\" + - "&& chmod +x installer.sh \\" + - "&& ./installer.sh \"${PATH_TO_SDK}\" \\" + - "&& rm -f installer.sh \\" + - "&& echo \"Current SDK version: $($PATH_TO_SDK/bin/spryker-sdk.sh --version)\" \\" + - "&& $PATH_TO_SDK/bin/spryker-sdk.sh" + docker_layer_caching_scope: "ACTION" + - action: "Install B2C" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "sudo rm -rf spryker-b2c && mkdir spryker-b2c && cd spryker-b2c \\" + - "&& export GITHUB_TOKEN=${GH_TOKEN} \\" + - "&& export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"'${GH_TOKEN}'\"}}' \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker-shop/b2c-demo-shop.git ./ \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker/docker-sdk.git docker \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" scheduler:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" mail_catcher:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" redis-gui:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" dashboard:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& docker/sdk boot deploy.dev.yml \\" + - "&& sed -i 's/- \"80:80\"/- \"8888:80\"/g' docker/deployment/default/docker-compose.yml \\" + - "&& docker/sdk up --build \\" + - "&& docker/sdk down" + - "" + timeout: 5400 + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true + - action: "Make jobs" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "export SDK_CI_EXECUTION=1 \\" + - "&& cd spryker-b2c && rm -rf .ssdk \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:init:project --qa_tasks=validation:php:codestyle-check --workflow=hello_php -q \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:qa:run --path=src \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle-check --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php:staged_set --foo=FOO --bar=BAR -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:workflow:run hello_php -n -vvv" + - "" + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true +- pipeline: "Upgrader Pre-Release " + events: + - type: "PUSH" + refs: + - "refs/heads/rc" + terminate_stale_runs: true + auto_clear_cache: true + fail_on_prepare_env_warning: true variables: - - key: "ACCESS_TOKEN" - value: "secure!lifFbTk9QlCr191sBzpx4KIZkBNwWx/90del0UAlelDR0GWW9Y8+XOUMALIrqsf7.W4VCKPKPwKz6UdZjiUPlhg==" - type: "VAR" - encrypted: true - - key: "SOURCE_CODE_PROVIDER" - value: "github" - type: "VAR" - docker_layer_caching_scope: "ACTION" - instance_type: "GENERAL_MEDIUM" - - action: "Check is PR created" - type: "GIT_HUB_CLI" - execute_commands: - - "PRS_CNT=$(gh search prs --owner=\"$ORGANIZATION_NAME\" --repo=\"$REPOSITORY_NAME\" --state=open --json title --jq='.[] | select(.title | test(\"^Auto-updating Spryker modules on+\", \"g\"))' | wc -l)" - - " " - - "if [ \"$PRS_CNT\" -eq 0 ]" - - "then" - - " echo 'Test failed: Open PR is not found.'" - - " exit 1" - - "fi" - - "" - - "echo 'Test passed: Open PR is detected.'" - shell: "BASH" - integration_hash: "Nz7x3VXyMYerMAg4dOBQn6LlRG" - - action: "Clean up Demo Shop repository" - type: "BUILD" - docker_image_name: "library/php" - docker_image_tag: "8.2.8" - execute_commands: - - "" - - "DIR=\"$TOOL_REPOSITORY_CLEANER_LOCAL_PATH\"" - - "[ ! -d \"$DIR\" ] && git clone $TOOL_REPOSITORY_CLEANER_GIT_URL \"$DIR\"" - - "" - - "cd \"$DIR\"" - - "" - - "composer install" - - "" - - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" - setup_commands: - - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" - - "apt-get update && apt-get install -y git zip" - - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" - - "" - - "# php ext gd" - - "apt-get install -y libfreetype6-dev" - - "apt-get install -y libjpeg62-turbo-dev" - - "apt-get install -y libpng-dev" - - "docker-php-ext-configure gd --with-freetype --with-jpeg" - - "docker-php-ext-install gd" - - "" - - "# php ext pdo_mysql" - - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" - - "docker-php-ext-install pdo_mysql" - - "" - - "# php ext zip" - - "apt-get install -y zip" - - "apt-get install -y unzip" - - "apt-get install -y zlib1g-dev" - - "apt-get install -y libzip-dev" - - "docker-php-ext-install zip" - ignore_errors: true - shell: "BASH" + - key: "GITHUB_TOKEN" + value: "secure!lifFbTk9QlCr191sBzpx4KIZkBNwWx/90del0UAlelDR0GWW9Y8+XOUMALIrqsf7.W4VCKPKPwKz6UdZjiUPlhg==" + type: "VAR" + encrypted: true + - key: "ORGANIZATION_NAME" + value: "pavelmaksimov25" + type: "VAR" + - key: "PROJECT_PATH" + value: "project" + type: "VAR" + - key: "PROJECT_REPO" + value: "https://github.com/pavelmaksimov25/b2b-demo-shop" + type: "VAR" + - key: "REPOSITORY_NAME" + value: "b2b-demo-shop" + type: "VAR" + - key: "TOOL_REPOSITORY_CLEANER_GIT_URL" + value: "https://github.com/pavelmaksimov25/repo-cleaner.git" + type: "VAR" + - key: "TOOL_REPOSITORY_CLEANER_LOCAL_PATH" + value: "repo_cleaner" + type: "VAR" + actions: + - action: "Build and push SDK image" + type: "DOCKERFILE" + docker_image_tag: "alpha-80" + dockerfile_path: "./infrastructure/sdk.sprykerci80.Dockerfile" + context_path: "." + repository: "luckyj/upgrader-php" + do_not_prune_images: true + integration_hash: "L39J4q2VolejOpAPajNmGQBW71" + - action: "Clone Demo Shop project" + type: "GIT_HUB_CLI" + execute_commands: + - "gh repo clone \"$PROJECT_REPO\" \"$PROJECT_PATH\"" + shell: "BASH" + integration_hash: "rG7YBDXMVyb8BQXgevAZEJ24gN" + - action: "Clean up Demo Shop repository" + type: "BUILD" + docker_image_name: "library/php" + docker_image_tag: "8.2.8" + execute_commands: + - "" + - "DIR=\"$TOOL_REPOSITORY_CLEANER_LOCAL_PATH\"" + - "[ ! -d \"$DIR\" ] && git clone $TOOL_REPOSITORY_CLEANER_GIT_URL \"$DIR\"" + - "" + - "cd \"$DIR\"" + - "" + - "composer install" + - "" + - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + setup_commands: + - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" + - "apt-get update && apt-get install -y git zip" + - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" + - "" + - "# php ext gd" + - "apt-get install -y libfreetype6-dev" + - "apt-get install -y libjpeg62-turbo-dev" + - "apt-get install -y libpng-dev" + - "docker-php-ext-configure gd --with-freetype --with-jpeg" + - "docker-php-ext-install gd" + - "" + - "# php ext pdo_mysql" + - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" + - "docker-php-ext-install pdo_mysql" + - "" + - "# php ext zip" + - "apt-get install -y zip" + - "apt-get install -y unzip" + - "apt-get install -y zlib1g-dev" + - "apt-get install -y libzip-dev" + - "docker-php-ext-install zip" + ignore_errors: true + shell: "BASH" + variables: + - key: "ORGANIZATION_NAME" + value: "pavelmaksimov25" + type: "VAR" + settable: true + - key: "REPOSITORY_NAME" + value: "b2b-demo-shop" + type: "VAR" + settable: true + timeout: 180 + - action: "Build and Run Upgrader" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "SOURCE_CODE_PROVIDER=\"github\"" + - "COMPOSER_GLOBAL_CMD=\"\"" + - "SOURCE_CODE_PROVIDER_URL=\"\"" + - "" + - "ACCESS_TOKEN=\"$GITHUB_TOKEN\"" + - "REPO_URL_ENDING=\".git\"" + - "COMPOSER_GLOBAL_CMD=\"composer global config -g github-oauth.github.com ${ACCESS_TOKEN}\"" + - "PROJECT_NAME=\"\"" + - "" + - "docker pull spryker/php-sdk:sprykerci" + - "" + - "cd \"$PROJECT_PATH\"" + - "git remote set-url origin https://${ORGANIZATION_NAME}:${ACCESS_TOKEN}@github.com/${ORGANIZATION_NAME}/${REPOSITORY_NAME}.git" + - "cd .." + - "" + - "docker run -u spryker --rm -v ${PWD}/\"$PROJECT_PATH\":/data/project \\" + - "-e ACCESS_TOKEN=${ACCESS_TOKEN} \\" + - "-e ORGANIZATION_NAME=${ORGANIZATION_NAME} \\" + - "-e REPOSITORY_NAME=${REPOSITORY_NAME} \\" + - "-e SOURCE_CODE_PROVIDER=${SOURCE_CODE_PROVIDER} \\" + - "-e SOURCE_CODE_PROVIDER_URL=\"${SOURCE_CODE_PROVIDER_URL}\" \\" + - "-e COMPOSER_GLOBAL_CMD=\"${COMPOSER_GLOBAL_CMD}\" \\" + - "-e PROJECT_NAME=\"${PROJECT_NAME}\" \\" + - "-e UPGRADE_STRATEGY=release-app \\" + - "-e INTEGRATOR_ENABLED=true \\" + - "-e EVALUATOR_ENABLED=true \\" + - "-e REPORTING_ENABLED=false \\" + - "-e REPORT_SEND_AUTH_TOKEN=\"\" \\" + - "-e NEWRELIC_ENABLED=false \\" + - "-e NEWRELIC_LICENSE=\"\" \\" + - "-e NEWRELIC_APPNAME=\"\" \\" + - "-e NEWRELIC_LOGLEVEL=\"\" \\" + - "-e RELEASE_GROUP_ID=\"\" \\" + - "-e APP_ENV=\"sprykerci\" \\" + - "spryker/php-sdk:sprykerci 'git config --global user.email upgrader@spryker.com " + - "&& git config --global user.name \"upgrader\" " + - "&& $COMPOSER_GLOBAL_CMD" + - "&& echo \"$COMPOSER_GLOBAL_CMD\"" + - "&& cd /data/project" + - "&& composer install --no-scripts " + - "&& ((git branch -D `git branch | grep -E \"upgradebot\\/\"` > /dev/null 2>&1) || true) " + - "&& /data/bin/console upgradability:php:upgrade -vvv'" + variables: + - key: "ACCESS_TOKEN" + value: "secure!lifFbTk9QlCr191sBzpx4KIZkBNwWx/90del0UAlelDR0GWW9Y8+XOUMALIrqsf7.W4VCKPKPwKz6UdZjiUPlhg==" + type: "VAR" + encrypted: true + - key: "SOURCE_CODE_PROVIDER" + value: "github" + type: "VAR" + docker_layer_caching_scope: "ACTION" + instance_type: "GENERAL_MEDIUM" + - action: "Check is PR created" + type: "GIT_HUB_CLI" + execute_commands: + - "PRS_CNT=$(gh search prs --owner=\"$ORGANIZATION_NAME\" --repo=\"$REPOSITORY_NAME\" --state=open --json title --jq='.[] | select(.title | test(\"^Auto-updating Spryker modules on+\", \"g\"))' | wc -l)" + - " " + - "if [ \"$PRS_CNT\" -eq 0 ]" + - "then" + - " echo 'Test failed: Open PR is not found.'" + - " exit 1" + - "fi" + - "" + - "echo 'Test passed: Open PR is detected.'" + shell: "BASH" + integration_hash: "Nz7x3VXyMYerMAg4dOBQn6LlRG" + - action: "Clean up Demo Shop repository" + type: "BUILD" + docker_image_name: "library/php" + docker_image_tag: "8.2.8" + execute_commands: + - "" + - "DIR=\"$TOOL_REPOSITORY_CLEANER_LOCAL_PATH\"" + - "[ ! -d \"$DIR\" ] && git clone $TOOL_REPOSITORY_CLEANER_GIT_URL \"$DIR\"" + - "" + - "cd \"$DIR\"" + - "" + - "composer install" + - "" + - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + setup_commands: + - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" + - "apt-get update && apt-get install -y git zip" + - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" + - "" + - "# php ext gd" + - "apt-get install -y libfreetype6-dev" + - "apt-get install -y libjpeg62-turbo-dev" + - "apt-get install -y libpng-dev" + - "docker-php-ext-configure gd --with-freetype --with-jpeg" + - "docker-php-ext-install gd" + - "" + - "# php ext pdo_mysql" + - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" + - "docker-php-ext-install pdo_mysql" + - "" + - "# php ext zip" + - "apt-get install -y zip" + - "apt-get install -y unzip" + - "apt-get install -y zlib1g-dev" + - "apt-get install -y libzip-dev" + - "docker-php-ext-install zip" + ignore_errors: true + shell: "BASH" + variables: + - key: "ORGANIZATION_NAME" + value: "pavelmaksimov25" + type: "VAR" + settable: true + - key: "REPOSITORY_NAME" + value: "b2b-demo-shop" + type: "VAR" + settable: true + timeout: 180 + - action: "Clear cache" + type: "CLEAR_CACHE" + cache_types: + - "DOCKER" + - "FILE_SYSTEM" + - "SERVICES" + - "ADDITIONAL" + - "DOCKER_CLI" + - action: "Execute php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + type: "BUILD" + trigger_time: "ON_FAILURE" + docker_image_name: "library/php" + docker_image_tag: "8.2.9" + execute_commands: + - "git clone https://github.com/pavelmaksimov25/repo-cleaner.git repo_cleaner" + - "" + - "cd repo_cleaner" + - "" + - "composer install" + - "" + - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" + setup_commands: + - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" + - "apt-get update && apt-get install -y git zip" + - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" + - "" + - "# php ext gd" + - "apt-get install -y libfreetype6-dev" + - "apt-get install -y libjpeg62-turbo-dev" + - "apt-get install -y libpng-dev" + - "docker-php-ext-configure gd --with-freetype --with-jpeg" + - "docker-php-ext-install gd" + - "" + - "# php ext pdo_mysql" + - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" + - "docker-php-ext-install pdo_mysql" + - "" + - "# php ext zip" + - "apt-get install -y zip" + - "apt-get install -y unzip" + - "apt-get install -y zlib1g-dev" + - "apt-get install -y libzip-dev" + - "docker-php-ext-install zip" + shell: "BASH" + - action: "Clear cache" + type: "CLEAR_CACHE" + trigger_time: "ON_FAILURE" + cache_types: + - "FILE_SYSTEM" +- pipeline: "SDK Pre-Release Smoke Tests" + events: + - type: "PUSH" + refs: + - "refs/heads/rc" + always_from_scratch: true + terminate_stale_runs: true + auto_clear_cache: true variables: - - key: "ORGANIZATION_NAME" - value: "pavelmaksimov25" - type: "VAR" - settable: true - - key: "REPOSITORY_NAME" - value: "b2b-demo-shop" - type: "VAR" - settable: true - timeout: 180 - - action: "Clear cache" - type: "CLEAR_CACHE" - cache_types: - - "DOCKER" - - "FILE_SYSTEM" - - "SERVICES" - - "ADDITIONAL" - - "DOCKER_CLI" - - action: "Execute php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" - type: "BUILD" - trigger_time: "ON_FAILURE" - docker_image_name: "library/php" - docker_image_tag: "8.2.9" - execute_commands: - - "git clone https://github.com/pavelmaksimov25/repo-cleaner.git repo_cleaner" - - "" - - "cd repo_cleaner" - - "" - - "composer install" - - "" - - "php bin/repoclean.php ${ORGANIZATION_NAME} ${REPOSITORY_NAME}" - setup_commands: - - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" - - "apt-get update && apt-get install -y git zip" - - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" - - "" - - "# php ext gd" - - "apt-get install -y libfreetype6-dev" - - "apt-get install -y libjpeg62-turbo-dev" - - "apt-get install -y libpng-dev" - - "docker-php-ext-configure gd --with-freetype --with-jpeg" - - "docker-php-ext-install gd" - - "" - - "# php ext pdo_mysql" - - "docker-php-ext-configure pdo_mysql --with-pdo-mysql" - - "docker-php-ext-install pdo_mysql" - - "" - - "# php ext zip" - - "apt-get install -y zip" - - "apt-get install -y unzip" - - "apt-get install -y zlib1g-dev" - - "apt-get install -y libzip-dev" - - "docker-php-ext-install zip" - shell: "BASH" - - action: "Clear cache" - type: "CLEAR_CACHE" - trigger_time: "ON_FAILURE" - cache_types: - - "FILE_SYSTEM" -- pipeline: "SDK Pre-Release Smoke Tests" - events: - - type: "CREATE_REF" - refs: - - "refs/heads/rc" - always_from_scratch: true - terminate_stale_runs: true - auto_clear_cache: true - variables: - - key: "GH_TOKEN" - value: "secure!8Th+XRNi+x0E4/q+trynssaoyPpWo/M9Z0OZL0qmDGqRGYh9mrScQ8JoOH6AImpI.A3YcoiZ8nLUIolQeEYBWAA==" - type: "VAR" - encrypted: true - - key: "GH_USER" - value: "pavelmaksymov25" - type: "VAR" - settable: true - change_set_base: "LATEST_RUN_MATCHING_REF" - actions: - - action: "Install SDK" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "rm -rf spryker-sdk; mkdir spryker-sdk \\" - - "&& cd spryker-sdk \\" - - "&& export PATH_TO_SDK=$(pwd) \\" - - "&& echo $PATH_TO_SDK \\" - - "&& curl -fL github.com/spryker-sdk/sdk/releases/latest/download/installer.sh -O \\" - - "&& chmod +x installer.sh \\" - - "&& ./installer.sh \"${PATH_TO_SDK}\" \\" - - "&& rm -f installer.sh \\" - - "&& echo \"Current SDK version: $($PATH_TO_SDK/bin/spryker-sdk.sh --version)\" \\" - - "&& $PATH_TO_SDK/bin/spryker-sdk.sh" - docker_layer_caching_scope: "ACTION" - instance_type: "GENERAL_MEDIUM" - - action: "Install B2C" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "sudo rm -rf spryker-b2c && mkdir spryker-b2c && cd spryker-b2c \\" - - "&& export GITHUB_TOKEN=${GH_TOKEN} \\" - - "&& export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"'${GH_TOKEN}'\"}}' \\" - - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker-shop/b2c-demo-shop.git ./ \\" - - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker/docker-sdk.git docker \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" scheduler:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" mail_catcher:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" redis-gui:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" dashboard:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" - - "&& docker/sdk boot deploy.dev.yml \\" - - "&& sed -i 's/- \"80:80\"/- \"8888:80\"/g' docker/deployment/default/docker-compose.yml \\" - - "&& docker/sdk up --build \\" - - "&& docker/sdk down" - - "" - timeout: 5400 - docker_layer_caching_scope: "ACTION" - vm_from_prev_action: true - instance_type: "GENERAL_MEDIUM" - - action: "Run tasks" - type: "NATIVE_BUILD_DOCKER_CLI" - commands: - - "export SDK_CI_EXECUTION=1 \\" - - "&& cd spryker-b2c && rm -rf .ssdk \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:init:project --qa_tasks=validation:php:codestyle-check --workflow=hello_php -q \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:qa:run --path=src \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle-check --path=src -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php:staged_set --foo=FOO --bar=BAR -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle --path=src -vvv \\" - - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:workflow:run hello_php -n -vvv" - - "" - docker_layer_caching_scope: "ACTION" - vm_from_prev_action: true - instance_type: "GENERAL_MEDIUM" + - key: "GH_TOKEN" + value: "secure!8Th+XRNi+x0E4/q+trynssaoyPpWo/M9Z0OZL0qmDGqRGYh9mrScQ8JoOH6AImpI.A3YcoiZ8nLUIolQeEYBWAA==" + type: "VAR" + encrypted: true + - key: "GH_USER" + value: "pavelmaksymov25" + type: "VAR" + settable: true + change_set_base: "LATEST_RUN_MATCHING_REF" + actions: + - action: "Install SDK" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "rm -rf spryker-sdk; mkdir spryker-sdk \\" + - "&& cd spryker-sdk \\" + - "&& export PATH_TO_SDK=$(pwd) \\" + - "&& echo $PATH_TO_SDK \\" + - "&& curl -fL github.com/spryker-sdk/sdk/releases/latest/download/installer.sh -O \\" + - "&& chmod +x installer.sh \\" + - "&& ./installer.sh \"${PATH_TO_SDK}\" \\" + - "&& rm -f installer.sh \\" + - "&& echo \"Current SDK version: $($PATH_TO_SDK/bin/spryker-sdk.sh --version)\" \\" + - "&& $PATH_TO_SDK/bin/spryker-sdk.sh" + docker_layer_caching_scope: "ACTION" + instance_type: "GENERAL_MEDIUM" + - action: "Install B2C" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "sudo rm -rf spryker-b2c && mkdir spryker-b2c && cd spryker-b2c \\" + - "&& export GITHUB_TOKEN=${GH_TOKEN} \\" + - "&& export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"'${GH_TOKEN}'\"}}' \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker-shop/b2c-demo-shop.git ./ \\" + - "&& git clone https://${GH_USER}:${GH_TOKEN}@github.com/spryker/docker-sdk.git docker \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" scheduler:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" mail_catcher:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" redis-gui:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& awk '/^[a-zA-Z_\\-]+:/ {level1=$0} /^ [a-zA-Z_\\-]+:/ {level2=$0} level1 ~ \"services:\" && level2 ~ \" dashboard:\" {next} 1' deploy.dev.yml > deploy.dev.yml.t && mv deploy.dev.yml.t deploy.dev.yml \\" + - "&& docker/sdk boot deploy.dev.yml \\" + - "&& sed -i 's/- \"80:80\"/- \"8888:80\"/g' docker/deployment/default/docker-compose.yml \\" + - "&& docker/sdk up --build \\" + - "&& docker/sdk down" + - "" + timeout: 5400 + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true + instance_type: "GENERAL_MEDIUM" + - action: "Run tasks" + type: "NATIVE_BUILD_DOCKER_CLI" + commands: + - "export SDK_CI_EXECUTION=1 \\" + - "&& cd spryker-b2c && rm -rf .ssdk \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:init:project --qa_tasks=validation:php:codestyle-check --workflow=hello_php -q \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:qa:run --path=src \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle-check --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh hello:php:staged_set --foo=FOO --bar=BAR -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh validation:php:codestyle --path=src -vvv \\" + - "&& ./../spryker-sdk/bin/spryker-sdk.sh sdk:workflow:run hello_php -n -vvv" + - "" + docker_layer_caching_scope: "ACTION" + vm_from_prev_action: true + instance_type: "GENERAL_MEDIUM" From 2bbb807c1131968bad16b39157391ea210cc34d8 Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Fri, 25 Aug 2023 10:19:19 +0200 Subject: [PATCH 42/53] Improved automation (#447) --- .../integrator-dependency-update-pr.yml | 45 ------------------- .../upgrader-dependency-update-pr.yml | 10 ++--- 2 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/integrator-dependency-update-pr.yml diff --git a/.github/workflows/integrator-dependency-update-pr.yml b/.github/workflows/integrator-dependency-update-pr.yml deleted file mode 100644 index 83b1d0ea..00000000 --- a/.github/workflows/integrator-dependency-update-pr.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Update Integrator dependencies - -env: - TARGET_BRANCH: rc - DEPENDENCY: spryker-sdk/integrator - PR_BRANCH: update-dependencies - PR_LABELS: composer dependencies - PR_ASSIGNEES: pavelmaksimov25,DmytroKlymanSpryker - PR_REVIEWERS: pavelmaksimov25,DmytroKlymanSpryker - -on: - repository_dispatch: - types: [ integrator_dependency_updated ] - -jobs: - update-dependencies: - runs-on: ubuntu-latest - steps: - - id: commit - uses: pr-mpt/actions-commit-hash@v2 - - - name: Checkout project - uses: actions/checkout@v3 - with: - ref: ${{ env.TARGET_BRANCH }} - - - name: Update dependencies - run: composer update ${{ env.DEPENDENCY }} --no-scripts --no-progress --no-install - - - name: Commit, push and create pull request - uses: peter-evans/create-pull-request@v5 - with: - title: Updated ${{ env.DEPENDENCY }} - body: | - This pull request updates ${{ env.DEPENDENCY }} dependency to the latest version. - commit-message: Updated ${{ env.DEPENDENCY }} dependency - committer: SprykerReleaseBot - author: ${{ github.actor }} <${{ github.actor }}@example.test> - base: ${{ env.TARGET_BRANCH }} - branch: ${{ env.PR_BRANCH }} - branch-suffix: timestamp - labels: ${{ env.PR_LABELS }} - delete-branch: true - assignees: ${{ env.PR_ASSIGNEES }} - reviewers: ${{ env.PR_REVIEWERS }} diff --git a/.github/workflows/upgrader-dependency-update-pr.yml b/.github/workflows/upgrader-dependency-update-pr.yml index 1af34dd5..c8f23ab0 100644 --- a/.github/workflows/upgrader-dependency-update-pr.yml +++ b/.github/workflows/upgrader-dependency-update-pr.yml @@ -2,7 +2,7 @@ name: Update Upgrader dependencies env: TARGET_BRANCH: rc - DEPENDENCY: spryker-sdk/upgrader + DEPENDENCIES: spryker-sdk/upgrader spryker-sdk/integrator PR_BRANCH: update-dependencies PR_LABELS: composer dependencies PR_ASSIGNEES: pavelmaksimov25,DmytroKlymanSpryker @@ -25,15 +25,15 @@ jobs: ref: ${{ env.TARGET_BRANCH }} - name: Update dependencies - run: composer require ${{ env.DEPENDENCY }} --no-scripts --no-progress --no-install + run: composer update ${{ env.DEPENDENCIES }} --no-scripts --no-progress --no-install - name: Commit, push and create pull request uses: peter-evans/create-pull-request@v5 with: - title: Updated ${{ env.DEPENDENCY }} + title: Updated internal SDK dependencies body: | - This pull request updates ${{ env.DEPENDENCY }} dependency to the latest version. - commit-message: Updated ${{ env.DEPENDENCY }} dependency + This pull request updates internal SDK dependencies ${{ env.DEPENDENCIES }} to the latest version. + commit-message: Updated SDK dependencies - ${{ env.DEPENDENCIES }} committer: SprykerReleaseBot author: ${{ github.actor }} <${{ github.actor }}@example.test> base: ${{ env.TARGET_BRANCH }} From b0b69efee02d7b843d8ada305d431893d3415a17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 12:23:09 +0200 Subject: [PATCH 43/53] Updated spryker-sdk/upgrader dependency (#448) Co-authored-by: pavelmaksimov25 --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 469515ba..188eab3f 100644 --- a/composer.lock +++ b/composer.lock @@ -7334,12 +7334,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "a143281d4951139714c686dc94e0f293b23e3ccc" + "reference": "27dfc1626e19ac04ac8f3db66e472007f94b4997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/a143281d4951139714c686dc94e0f293b23e3ccc", - "reference": "a143281d4951139714c686dc94e0f293b23e3ccc", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/27dfc1626e19ac04ac8f3db66e472007f94b4997", + "reference": "27dfc1626e19ac04ac8f3db66e472007f94b4997", "shasum": "" }, "require": { @@ -7401,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-18T15:09:30+00:00" + "time": "2023-08-25T08:23:35+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16085,8 +16085,7 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20, - "spryker-sdk/upgrader": 20 + "spryker-sdk/composer-replace": 20 }, "prefer-stable": true, "prefer-lowest": false, From 16e7d6378a8d248d32ad83b10d362e87bb6cf571 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:38:07 +0200 Subject: [PATCH 44/53] Updated SDK dependencies - spryker-sdk/upgrader, spryker-sdk/integrator (#450) Co-authored-by: pavelmaksimov25 --- composer.lock | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 188eab3f..f5105109 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "2828f1dbc03af7eac45a49148e2cd97f010e00f1" + "reference": "34d563e2658b66d81df8bc5ac39c386f6a461614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/2828f1dbc03af7eac45a49148e2cd97f010e00f1", - "reference": "2828f1dbc03af7eac45a49148e2cd97f010e00f1", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/34d563e2658b66d81df8bc5ac39c386f6a461614", + "reference": "34d563e2658b66d81df8bc5ac39c386f6a461614", "shasum": "" }, "require": { @@ -7139,7 +7139,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-18T15:05:56+00:00" + "time": "2023-08-25T13:17:52+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7334,12 +7334,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "27dfc1626e19ac04ac8f3db66e472007f94b4997" + "reference": "1902deac5da94b83139a98a011d9f1ea70bf08e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/27dfc1626e19ac04ac8f3db66e472007f94b4997", - "reference": "27dfc1626e19ac04ac8f3db66e472007f94b4997", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/1902deac5da94b83139a98a011d9f1ea70bf08e9", + "reference": "1902deac5da94b83139a98a011d9f1ea70bf08e9", "shasum": "" }, "require": { @@ -7401,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-25T08:23:35+00:00" + "time": "2023-08-28T14:27:47+00:00" }, { "name": "spryker/architecture-sniffer", @@ -16085,7 +16085,8 @@ "minimum-stability": "dev", "stability-flags": { "spryker-sdk/brancho": 20, - "spryker-sdk/composer-replace": 20 + "spryker-sdk/composer-replace": 20, + "spryker-sdk/upgrader": 20 }, "prefer-stable": true, "prefer-lowest": false, From a81fd5d6f4b4c81ec0d09be334440825dc4a112d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 10:48:41 +0200 Subject: [PATCH 45/53] Updated SDK dependencies - spryker-sdk/upgrader spryker-sdk/integrator (#452) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index f5105109..096fd301 100644 --- a/composer.lock +++ b/composer.lock @@ -7334,12 +7334,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "1902deac5da94b83139a98a011d9f1ea70bf08e9" + "reference": "77148ce10c01f2754a0b3542a0c536b91f0da848" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/1902deac5da94b83139a98a011d9f1ea70bf08e9", - "reference": "1902deac5da94b83139a98a011d9f1ea70bf08e9", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/77148ce10c01f2754a0b3542a0c536b91f0da848", + "reference": "77148ce10c01f2754a0b3542a0c536b91f0da848", "shasum": "" }, "require": { @@ -7401,7 +7401,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-28T14:27:47+00:00" + "time": "2023-08-31T08:02:56+00:00" }, { "name": "spryker/architecture-sniffer", From 7575a9c9760c12fb63c900a89c4a7d2c93349283 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 10:58:46 +0200 Subject: [PATCH 46/53] Updated SDK dependencies - spryker-sdk/upgrader spryker-sdk/integrator (#453) Co-authored-by: pavelmaksimov25 --- composer.lock | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 096fd301..468be2e2 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "34d563e2658b66d81df8bc5ac39c386f6a461614" + "reference": "f9048db04c1e3e2ecbcf8c5af695d4bcfc292dd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/34d563e2658b66d81df8bc5ac39c386f6a461614", - "reference": "34d563e2658b66d81df8bc5ac39c386f6a461614", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/f9048db04c1e3e2ecbcf8c5af695d4bcfc292dd6", + "reference": "f9048db04c1e3e2ecbcf8c5af695d4bcfc292dd6", "shasum": "" }, "require": { @@ -7098,7 +7098,9 @@ "composer/composer": "^2.1.0", "czproject/git-php": "^4.1", "ext-dom": "*", + "ext-json": "*", "ext-simplexml": "*", + "guzzlehttp/guzzle": "^7.4", "laminas/laminas-filter": "^2.11.0", "nikic/php-parser": "^4.3.0", "php": ">=7.4", @@ -7139,7 +7141,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-25T13:17:52+00:00" + "time": "2023-08-31T08:03:48+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7334,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "77148ce10c01f2754a0b3542a0c536b91f0da848" + "reference": "4f55d3619a312737c58b4a4cb042bfa4a1a88572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/77148ce10c01f2754a0b3542a0c536b91f0da848", - "reference": "77148ce10c01f2754a0b3542a0c536b91f0da848", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/4f55d3619a312737c58b4a4cb042bfa4a1a88572", + "reference": "4f55d3619a312737c58b4a4cb042bfa4a1a88572", "shasum": "" }, "require": { @@ -7401,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-31T08:02:56+00:00" + "time": "2023-08-31T08:52:47+00:00" }, { "name": "spryker/architecture-sniffer", From 84d96f6cf341d12f349ab4f8cfc2ca13440be6bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:05:00 +0200 Subject: [PATCH 47/53] Updated SDK dependencies - spryker-sdk/upgrader spryker-sdk/integrator (#455) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 468be2e2..89a93460 100644 --- a/composer.lock +++ b/composer.lock @@ -7336,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "4f55d3619a312737c58b4a4cb042bfa4a1a88572" + "reference": "beda2d1a61866111a8a8f0a1d31baf73cd1ae020" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/4f55d3619a312737c58b4a4cb042bfa4a1a88572", - "reference": "4f55d3619a312737c58b4a4cb042bfa4a1a88572", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/beda2d1a61866111a8a8f0a1d31baf73cd1ae020", + "reference": "beda2d1a61866111a8a8f0a1d31baf73cd1ae020", "shasum": "" }, "require": { @@ -7403,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-31T08:52:47+00:00" + "time": "2023-08-31T12:15:40+00:00" }, { "name": "spryker/architecture-sniffer", From 9eeda1cc7071168d1baa67d780d0248949fa0451 Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Mon, 4 Sep 2023 12:13:45 +0200 Subject: [PATCH 48/53] Update evaluator --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 89a93460..d405102d 100644 --- a/composer.lock +++ b/composer.lock @@ -7005,16 +7005,16 @@ }, { "name": "spryker-sdk/evaluator", - "version": "0.1.5", + "version": "0.1.6", "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a" + "reference": "f8f990e6a5bf9f4914e98e32c0f759cfc73f89d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/1acb655209157b309e58e8f79dfd6a2be93e901a", - "reference": "1acb655209157b309e58e8f79dfd6a2be93e901a", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/f8f990e6a5bf9f4914e98e32c0f759cfc73f89d9", + "reference": "f8f990e6a5bf9f4914e98e32c0f759cfc73f89d9", "shasum": "" }, "require": { @@ -7074,9 +7074,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.5" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.6" }, - "time": "2023-08-07T12:28:16+00:00" + "time": "2023-09-04T07:27:07+00:00" }, { "name": "spryker-sdk/integrator", From 7ebbffae72365cf8b082237d39b4421fa96aedd3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 13:20:16 +0200 Subject: [PATCH 49/53] Updated SDK dependencies - spryker-sdk/upgrader spryker-sdk/integrator (#456) Co-authored-by: pavelmaksimov25 --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index d405102d..743a6ac9 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "f9048db04c1e3e2ecbcf8c5af695d4bcfc292dd6" + "reference": "028310a16622d69fe9719a4a23f45f69db5c48e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/f9048db04c1e3e2ecbcf8c5af695d4bcfc292dd6", - "reference": "f9048db04c1e3e2ecbcf8c5af695d4bcfc292dd6", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/028310a16622d69fe9719a4a23f45f69db5c48e5", + "reference": "028310a16622d69fe9719a4a23f45f69db5c48e5", "shasum": "" }, "require": { @@ -7141,7 +7141,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-08-31T08:03:48+00:00" + "time": "2023-09-04T10:15:55+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7336,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "beda2d1a61866111a8a8f0a1d31baf73cd1ae020" + "reference": "fd990fd803a074d4cc3b122bd57ab3efdc84727c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/beda2d1a61866111a8a8f0a1d31baf73cd1ae020", - "reference": "beda2d1a61866111a8a8f0a1d31baf73cd1ae020", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/fd990fd803a074d4cc3b122bd57ab3efdc84727c", + "reference": "fd990fd803a074d4cc3b122bd57ab3efdc84727c", "shasum": "" }, "require": { @@ -7403,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-08-31T12:15:40+00:00" + "time": "2023-09-04T10:19:50+00:00" }, { "name": "spryker/architecture-sniffer", From 839af9685dc60088ffab7351f25026df411cc31a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 09:36:40 +0200 Subject: [PATCH 50/53] Updated SDK dependencies - spryker-sdk/upgrader spryker-sdk/integrator (#458) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 743a6ac9..383f23ed 100644 --- a/composer.lock +++ b/composer.lock @@ -7336,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "fd990fd803a074d4cc3b122bd57ab3efdc84727c" + "reference": "85e341795907d05a25526afa824c91ec0352901d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/fd990fd803a074d4cc3b122bd57ab3efdc84727c", - "reference": "fd990fd803a074d4cc3b122bd57ab3efdc84727c", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/85e341795907d05a25526afa824c91ec0352901d", + "reference": "85e341795907d05a25526afa824c91ec0352901d", "shasum": "" }, "require": { @@ -7403,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-09-04T10:19:50+00:00" + "time": "2023-09-05T07:35:28+00:00" }, { "name": "spryker/architecture-sniffer", From 49fda3ef9d80ff7fe787a24840ef54ca7a075323 Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Tue, 5 Sep 2023 10:12:02 +0200 Subject: [PATCH 51/53] Update upgrader --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 383f23ed..cbc11d35 100644 --- a/composer.lock +++ b/composer.lock @@ -7336,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "85e341795907d05a25526afa824c91ec0352901d" + "reference": "a509b877bcda49b78e0e689bd31c28b8cf7c2d9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/85e341795907d05a25526afa824c91ec0352901d", - "reference": "85e341795907d05a25526afa824c91ec0352901d", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/a509b877bcda49b78e0e689bd31c28b8cf7c2d9b", + "reference": "a509b877bcda49b78e0e689bd31c28b8cf7c2d9b", "shasum": "" }, "require": { @@ -7403,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-09-05T07:35:28+00:00" + "time": "2023-09-05T07:39:29+00:00" }, { "name": "spryker/architecture-sniffer", From 421b409cad3798cafa1d2a7a8456c4d667becb9e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 15:29:27 +0200 Subject: [PATCH 52/53] Updated SDK dependencies - spryker-sdk/upgrader spryker-sdk/integrator (#459) Co-authored-by: pavelmaksimov25 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index cbc11d35..ee91208c 100644 --- a/composer.lock +++ b/composer.lock @@ -7336,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "a509b877bcda49b78e0e689bd31c28b8cf7c2d9b" + "reference": "641691c11658f658bf863a748ee6f9b8037e25c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/a509b877bcda49b78e0e689bd31c28b8cf7c2d9b", - "reference": "a509b877bcda49b78e0e689bd31c28b8cf7c2d9b", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/641691c11658f658bf863a748ee6f9b8037e25c1", + "reference": "641691c11658f658bf863a748ee6f9b8037e25c1", "shasum": "" }, "require": { @@ -7403,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-09-05T07:39:29+00:00" + "time": "2023-09-05T13:25:57+00:00" }, { "name": "spryker/architecture-sniffer", From ef36e576f6847aff5f142ac5444cb995928f96b5 Mon Sep 17 00:00:00 2001 From: Dmytro Klyman Date: Mon, 11 Sep 2023 14:56:30 +0200 Subject: [PATCH 53/53] Update composer in php 7.4 images (#461) --- infrastructure/sdk.sprykerci74.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infrastructure/sdk.sprykerci74.Dockerfile b/infrastructure/sdk.sprykerci74.Dockerfile index fe7a45ca..0409135e 100644 --- a/infrastructure/sdk.sprykerci74.Dockerfile +++ b/infrastructure/sdk.sprykerci74.Dockerfile @@ -12,7 +12,8 @@ RUN apk update \ nodejs \ npm \ rsync \ - && npm install -g npm@8.4.1 + && npm install -g npm@8.4.1 \ + && composer self-update RUN git config --add --system safe.directory /project