Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Maintenance] Fix package build #14130

Merged
merged 6 commits into from Jul 6, 2022
Merged

[Maintenance] Fix package build #14130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e02527d
[Maintenance] Fix package build
lchrusciel Jul 5, 2022
fc943c2
[Maintenance] Allow flex plugin during package installation
lchrusciel Jul 5, 2022
8f1aa5e
[Maintenance] Update vendors instead of install to take advantage of …
lchrusciel Jul 5, 2022
4aebc7e
[Maintenance] Install flex locally
lchrusciel Jul 5, 2022
caa3d26
Allow symfony/flex plugin globally
jakubtobiasz Jul 5, 2022
bd8f481
Make installing symfony/flex global in packages workflow
jakubtobiasz Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/application.yml
View file
Open in desktop
Expand Up @@ -57,6 +57,7 @@ jobs:
name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"

Expand Down Expand Up @@ -103,7 +104,7 @@ jobs:
run: composer validate --strict --no-check-version
if: always() && steps.end-of-setup.outcome == 'success'

-
-
name: Generate composer diff
uses: IonBazan/composer-diff-action@v1
if: steps.check-old-composer-lock-existence.outputs.files_exists == 'true'
Expand Down Expand Up @@ -191,6 +192,7 @@ jobs:
- name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"
- name: Get Composer cache directory
Expand Down Expand Up @@ -249,6 +251,7 @@ jobs:
name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"

Expand Down Expand Up @@ -332,6 +335,7 @@ jobs:
name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"

Expand Down Expand Up @@ -382,7 +386,7 @@ jobs:
-
name: Validate Database Schema
run: bin/console doctrine:schema:validate -vvv

-
name: Test installer
run: bin/console sylius:install --no-interaction -vvv
Expand Down Expand Up @@ -466,6 +470,7 @@ jobs:
name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"

Expand Down Expand Up @@ -512,7 +517,7 @@ jobs:
run: |
bin/console doctrine:migrations:migrate first --no-interaction
bin/console doctrine:migrations:migrate latest --no-interaction

-
name: Validate Database Schema
run: bin/console doctrine:schema:validate -vvv
Expand Down Expand Up @@ -596,6 +601,7 @@ jobs:
name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/packages.yml
View file
Open in desktop
Expand Up @@ -84,6 +84,7 @@ jobs:
name: Restrict Symfony version
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer config extra.symfony.require "${{ matrix.symfony }}"
working-directory: "src/Sylius/${{ matrix.package }}"
Expand All @@ -95,7 +96,7 @@ jobs:

-
name: Install dependencies
run: composer install --ansi --no-interaction
run: composer update --no-interaction --no-scripts
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/Sylius/${{ matrix.package }}"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/AddressingBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,6 +46,11 @@
"symfony/form": "^4.4 || ^5.4",
"symfony/validator": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AddressingBundle/test/app/AppKernel.php
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

class AppKernel extends Kernel
{
public function registerBundles()
public function registerBundles(): iterable
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
Expand All @@ -37,7 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}

protected function getContainerBaseClass()
protected function getContainerBaseClass(): string
{
if (str_starts_with($this->environment, 'test')) {
return MockerContainer::class;
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/AdminBundle/composer.json
View file
Open in desktop
Expand Up @@ -42,6 +42,11 @@
"phpunit/phpunit": "^8.5",
"symfony/dependency-injection": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/ApiBundle/composer.json
View file
Open in desktop
Expand Up @@ -49,6 +49,11 @@
"doctrine/doctrine-bundle": "2.3.0",
"symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/AttributeBundle/composer.json
View file
Open in desktop
Expand Up @@ -41,6 +41,11 @@
"symfony/dependency-injection": "^4.4 || ^5.4",
"symfony/form": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/ChannelBundle/composer.json
View file
Open in desktop
Expand Up @@ -41,6 +41,11 @@
"symfony/form": "^4.4 || ^5.4",
"twig/twig": "^2.12"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/ChannelBundle/test/app/AppKernel.php
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

class AppKernel extends Kernel
{
public function registerBundles()
public function registerBundles(): iterable
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
Expand All @@ -37,7 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}

protected function getContainerBaseClass()
protected function getContainerBaseClass(): string
{
if (str_starts_with($this->environment, 'test')) {
return MockerContainer::class;
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/CoreBundle/composer.json
View file
Open in desktop
Expand Up @@ -82,6 +82,11 @@
"conflict": {
"symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/CurrencyBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,6 +45,11 @@
"symfony/form": "^4.4 || ^5.4",
"twig/twig": "^2.12"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/CurrencyBundle/test/app/AppKernel.php
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

class AppKernel extends Kernel
{
public function registerBundles()
public function registerBundles(): iterable
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
Expand All @@ -37,7 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}

protected function getContainerBaseClass()
protected function getContainerBaseClass(): string
{
if (str_starts_with($this->environment, 'test')) {
return MockerContainer::class;
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/CustomerBundle/composer.json
View file
Open in desktop
Expand Up @@ -54,6 +54,11 @@
"symfony/dependency-injection": "^4.4 || ^5.4",
"symfony/form": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/CustomerBundle/test/app/AppKernel.php
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

class AppKernel extends Kernel
{
public function registerBundles()
public function registerBundles(): iterable
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
Expand All @@ -37,7 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}

protected function getContainerBaseClass()
protected function getContainerBaseClass(): string
{
if (str_starts_with($this->environment, 'test')) {
return MockerContainer::class;
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/InventoryBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,6 +45,11 @@
"symfony/dependency-injection": "^4.4 || ^5.4",
"twig/twig": "^2.12"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/LocaleBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,6 +45,11 @@
"symfony/dependency-injection": "^4.4 || ^5.2",
"twig/twig": "^2.12"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/LocaleBundle/test/app/AppKernel.php
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

class AppKernel extends Kernel
{
public function registerBundles()
public function registerBundles(): iterable
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
Expand All @@ -37,7 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}

protected function getContainerBaseClass()
protected function getContainerBaseClass(): string
{
if (str_starts_with($this->environment, 'test')) {
return MockerContainer::class;
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/MoneyBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,6 +46,11 @@
"symfony/form": "^4.4 || ^5.2",
"twig/twig": "^2.12"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/MoneyBundle/test/app/AppKernel.php
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

class AppKernel extends Kernel
{
public function registerBundles()
public function registerBundles(): iterable
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
Expand All @@ -37,7 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}

protected function getContainerBaseClass()
protected function getContainerBaseClass(): string
{
if (str_starts_with($this->environment, 'test')) {
return MockerContainer::class;
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/OrderBundle/composer.json
View file
Open in desktop
Expand Up @@ -48,6 +48,11 @@
"symfony/form": "^4.4 || ^5.4",
"symfony/validator": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/PaymentBundle/composer.json
View file
Open in desktop
Expand Up @@ -44,6 +44,11 @@
"symfony/browser-kit": "^4.4 || ^5.4",
"symfony/dependency-injection": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/PayumBundle/composer.json
View file
Open in desktop
Expand Up @@ -42,6 +42,11 @@
"phpspec/phpspec": "^7.2",
"symfony/dependency-injection": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/ProductBundle/composer.json
View file
Open in desktop
Expand Up @@ -44,6 +44,11 @@
"symfony/form": "^4.4 || ^5.4",
"symfony/validator": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/PromotionBundle/composer.json
View file
Open in desktop
Expand Up @@ -50,6 +50,11 @@
"symfony/form": "^4.4 || ^5.4",
"symfony/validator": "^4.4 || ^5.4"
},
"config": {
"allow-plugins": {
"symfony/flex": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
Expand Down