-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from odiseoteam/1.1
Update Sylius 1.12 and Symfony 6.4
- Loading branch information
Showing
74 changed files
with
281 additions
and
658 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,44 +14,39 @@ on: | |
|
|
||
| jobs: | ||
| tests: | ||
| runs-on: ubuntu-18.04 | ||
| runs-on: ubuntu-latest | ||
|
|
||
| name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}" | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php: ["7.4", "8.0"] | ||
| symfony: ["^5.4"] | ||
| sylius: ["~1.10.0", '~1.11.0'] | ||
| node: ["14.x"] | ||
| php: ["8.0", "8.1"] | ||
| symfony: ["5.4.*", "^6.0"] | ||
| sylius: ["^1.12"] | ||
| node: ["14.x", "16.x", "18.x"] | ||
| mysql: ["5.7", "8.0"] | ||
|
|
||
| exclude: | ||
| - | ||
| php: "7.4" | ||
| sylius: "~1.11.0" | ||
|
|
||
| env: | ||
| APP_ENV: test | ||
| DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}" | ||
|
|
||
| steps: | ||
| - | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - | ||
| name: Setup PHP | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: "${{ matrix.php }}" | ||
| extensions: intl | ||
| tools: symfony | ||
| tools: flex,symfony | ||
| coverage: none | ||
|
|
||
| - | ||
| name: Setup Node | ||
| uses: actions/setup-node@v1 | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: "${{ matrix.node }}" | ||
|
|
||
|
|
@@ -85,22 +80,27 @@ jobs: | |
| - | ||
| name: Get Composer cache directory | ||
| id: composer-cache | ||
| run: echo "::set-output name=dir::$(composer config cache-files-dir)" | ||
| run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT | ||
|
|
||
| - | ||
| name: Cache Composer | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ steps.composer-cache.outputs.dir }} | ||
| key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-php-${{ matrix.php }}-composer- | ||
| - | ||
| name: Configure global composer | ||
| run: | | ||
| composer global config --no-plugins allow-plugins.symfony/flex true | ||
| composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.2.2" | ||
| - | ||
| name: Restrict Symfony version | ||
| if: matrix.symfony != '' | ||
| run: | | ||
| composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10" | ||
| composer config extra.symfony.require "${{ matrix.symfony }}" | ||
| - | ||
|
|
@@ -111,15 +111,17 @@ jobs: | |
| - | ||
| name: Install PHP dependencies | ||
| run: composer install --no-interaction | ||
| env: | ||
| SYMFONY_REQUIRE: ${{ matrix.symfony }} | ||
|
|
||
| - | ||
| name: Get Yarn cache directory | ||
| id: yarn-cache | ||
| run: echo "::set-output name=dir::$(yarn cache dir)" | ||
| run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT | ||
|
|
||
| - | ||
| name: Cache Yarn | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ steps.yarn-cache.outputs.dir }} | ||
| key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }} | ||
|
|
@@ -140,7 +142,7 @@ jobs: | |
| name: Prepare test application assets | ||
| run: | | ||
| (cd tests/Application && bin/console assets:install public -vvv) | ||
| (cd tests/Application && yarn build) | ||
| (cd tests/Application && yarn build:prod) | ||
| - | ||
| name: Prepare test application cache | ||
|
|
@@ -184,7 +186,7 @@ jobs: | |
|
|
||
| - | ||
| name: Upload Behat logs | ||
| uses: actions/upload-artifact@v2 | ||
| uses: actions/upload-artifact@v3 | ||
| if: failure() | ||
| with: | ||
| name: Behat logs | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,20 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer; | ||
| use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff; | ||
| use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; | ||
| use Symplify\EasyCodingStandard\ValueObject\Option; | ||
| use Symplify\EasyCodingStandard\Config\ECSConfig; | ||
|
|
||
| return static function (ECSConfig $ecsConfig): void { | ||
| $ecsConfig->paths([ | ||
| __DIR__ . '/src', | ||
| __DIR__ . '/tests/Behat', | ||
| __DIR__ . '/ecs.php', | ||
| ]); | ||
|
|
||
| return static function (ContainerConfigurator $containerConfigurator): void { | ||
| $containerConfigurator->import('vendor/sylius-labs/coding-standard/ecs.php'); | ||
| $ecsConfig->import('vendor/sylius-labs/coding-standard/ecs.php'); | ||
|
|
||
| $containerConfigurator->parameters()->set(Option::SKIP, [ | ||
| $ecsConfig->skip([ | ||
| VisibilityRequiredFixer::class => ['*Spec.php'], | ||
| ]); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.