From fe21dd205d8943b38169d411ee83c97ed54dc08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Wed, 19 Jan 2022 14:11:15 +0100 Subject: [PATCH 1/4] [Maintenance] Replace `test-package.sh` with native GH Actions --- .github/workflows/packages.yml | 16 +++++- bin/test-package | 98 ---------------------------------- 2 files changed, 14 insertions(+), 100 deletions(-) delete mode 100755 bin/test-package diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 1640c8efd6c..95c7cb526be 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -99,8 +99,20 @@ jobs: working-directory: "src/Sylius/${{ matrix.package }}" - - name: Test package - run: bin/test-package src/Sylius/${{ matrix.package }} + name: Setup Database(for ApiBundle only) + working-directory: "src/Sylius/${{ matrix.package }}" + run: test/bin/console doctrine:schema:update --force -e test + if: always() && matrix.package == 'Bundle/ApiBundle' + + - + name: Run PHPSpec + working-directory: "src/Sylius/${{ matrix.package }}" + run: vendor/bin/phpspec run --ansi --no-interaction -f dot + + - + name: Run PHPUnit + working-directory: "src/Sylius/${{ matrix.package }}" + run: vendor/bin/phpunit --colors=always notify-about-build-failure: runs-on: ubuntu-latest diff --git a/bin/test-package b/bin/test-package deleted file mode 100755 index 3b3e31064cf..00000000000 --- a/bin/test-package +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env bash - -source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../etc/bash/common.lib.sh" - -# Argument 1: Package path -test_package() { - local exit_code=0 - - if [ "$(package_path_to_package_name "$1")" == "ApiBundle" ] ; then - (cd src/Sylius/Bundle/ApiBundle/test && bin/console doctrine:schema:update --force -e test) - fi - - print_header "Testing" "$(package_path_to_package_name "$1")" - - cd "$1" 2>/dev/null - exit_on_error "Cannot change current directory to $1" - - if [[ "$(composer run-script --list 2> /dev/null | awk '{ print $1 }' | grep -c ^test$)" = "0" ]]; then - run_phpspec "$1" || exit_code=$? - run_phpunit "$1" || exit_code=$? - else - run_command "composer test" || exit_code=$? - fi - - return ${exit_code} -} - -# Argument 1: Package path -run_phpspec() { - local phpspec - if [[ ! -e "phpspec.yml.dist" && ! -e "phpspec.yml" ]]; then - return 0 - fi - - phpspec="$(get_binary phpspec)" - if [ "$?" != "0" ]; then - print_error "Phpspec binary not found, make sure you included it in require-dev" - return 1 - fi - - retry_run_command "${phpspec} run --ansi --no-interaction --format=dot" -} - -# Argument 1: Package path -run_phpunit() { - local phpunit - if [[ ! -e "phpunit.xml.dist" && ! -e "phpunit.xml" ]]; then - return 0 - fi - - phpunit="$(get_binary phpunit)" - if [ "$?" != "0" ]; then - print_error "Phpunit binary not found, make sure you included it in require-dev" - return 1 - fi - - retry_run_command "${phpunit} --colors=always" -} - -display_help_message() { - print_error "Usage: $0 " -} - -main() { - local packages=() options=() package_path - - while [[ $# -gt 0 ]]; do - case "$1" in - --help) - display_help_message - exit 0 - ;; - -*) - print_error "Unknown option \"$1\"" - exit 1 - ;; - *) - packages+=("$1") - ;; - esac - - shift - done - - if [[ "${packages[@]}" = "" ]]; then - display_help_message - exit 1 - fi - - for package in "${packages[@]}"; do - package_path="$(cast_package_argument_to_package_path "${package}")" - exit_on_error "Package \"${package}\" is not found" - - test_package "${package_path}" "${options[*]}" - done -} - -main "$@" From 071253828dcf7fb0d676d315ee6ba2e5bd8821cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Wed, 19 Jan 2022 14:21:35 +0100 Subject: [PATCH 2/4] [Maintenance] Add packages.yml to the whitelisted paths for which it should be triggered --- .github/workflows/packages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 95c7cb526be..52dbe8ea9dc 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -7,10 +7,12 @@ on: paths: - "src/Sylius/Bundle/**" - "src/Sylius/Component/**" + - ".github/workflows/packages.yml" pull_request: paths: - "src/Sylius/Bundle/**" - "src/Sylius/Component/**" + - ".github/workflows/packages.yml" release: types: [created] schedule: From d3c9a87e2c9e4085da03474261d78a618617a04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Wed, 19 Jan 2022 16:58:08 +0100 Subject: [PATCH 3/4] [Maintenance] Bring default placement of bin files severd by vendors --- src/Sylius/Bundle/AddressingBundle/composer.json | 3 --- src/Sylius/Bundle/AdminBundle/composer.json | 3 --- src/Sylius/Bundle/AttributeBundle/composer.json | 3 --- src/Sylius/Bundle/ChannelBundle/composer.json | 3 --- src/Sylius/Bundle/CoreBundle/composer.json | 3 --- src/Sylius/Bundle/CurrencyBundle/composer.json | 3 --- src/Sylius/Bundle/CustomerBundle/composer.json | 3 --- src/Sylius/Bundle/InventoryBundle/composer.json | 3 --- src/Sylius/Bundle/LocaleBundle/composer.json | 3 --- src/Sylius/Bundle/MoneyBundle/composer.json | 3 --- src/Sylius/Bundle/OrderBundle/composer.json | 3 --- src/Sylius/Bundle/PaymentBundle/composer.json | 3 --- src/Sylius/Bundle/PayumBundle/composer.json | 3 --- src/Sylius/Bundle/ProductBundle/composer.json | 3 --- src/Sylius/Bundle/PromotionBundle/composer.json | 3 --- src/Sylius/Bundle/ReviewBundle/composer.json | 3 --- src/Sylius/Bundle/ShippingBundle/composer.json | 3 --- src/Sylius/Bundle/ShopBundle/composer.json | 3 --- src/Sylius/Bundle/TaxationBundle/composer.json | 3 --- src/Sylius/Bundle/TaxonomyBundle/composer.json | 3 --- src/Sylius/Bundle/UiBundle/composer.json | 3 --- src/Sylius/Bundle/UserBundle/composer.json | 3 --- src/Sylius/Component/Addressing/composer.json | 3 --- src/Sylius/Component/Attribute/composer.json | 3 --- src/Sylius/Component/Channel/composer.json | 3 --- src/Sylius/Component/Core/composer.json | 3 --- src/Sylius/Component/Currency/composer.json | 3 --- src/Sylius/Component/Customer/composer.json | 3 --- src/Sylius/Component/Inventory/composer.json | 3 --- src/Sylius/Component/Locale/composer.json | 3 --- src/Sylius/Component/Order/composer.json | 3 --- src/Sylius/Component/Payment/composer.json | 3 --- src/Sylius/Component/Product/composer.json | 3 --- src/Sylius/Component/Promotion/composer.json | 3 --- src/Sylius/Component/Review/composer.json | 3 --- src/Sylius/Component/Shipping/composer.json | 3 --- src/Sylius/Component/Taxation/composer.json | 3 --- src/Sylius/Component/Taxonomy/composer.json | 3 --- src/Sylius/Component/User/composer.json | 3 --- 39 files changed, 117 deletions(-) diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index 6a1d64845ec..181c70f96e5 100644 --- a/src/Sylius/Bundle/AddressingBundle/composer.json +++ b/src/Sylius/Bundle/AddressingBundle/composer.json @@ -46,9 +46,6 @@ "symfony/form": "^4.4 || ^5.2", "symfony/validator": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json index 3eaf7a9f86b..dfa142784e4 100644 --- a/src/Sylius/Bundle/AdminBundle/composer.json +++ b/src/Sylius/Bundle/AdminBundle/composer.json @@ -42,9 +42,6 @@ "phpunit/phpunit": "^8.5", "symfony/dependency-injection": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json index 542cc908dff..eb4592d9a63 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -41,9 +41,6 @@ "symfony/dependency-injection": "^4.4 || ^5.2", "symfony/form": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json index dfff354d58b..1951922e26b 100644 --- a/src/Sylius/Bundle/ChannelBundle/composer.json +++ b/src/Sylius/Bundle/ChannelBundle/composer.json @@ -41,9 +41,6 @@ "symfony/form": "^4.4 || ^5.2", "twig/twig": "^2.12" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index 04570aa4f87..636cfcd6119 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -82,9 +82,6 @@ "conflict": { "symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json index 3f629869ab1..baeb44dc7c2 100644 --- a/src/Sylius/Bundle/CurrencyBundle/composer.json +++ b/src/Sylius/Bundle/CurrencyBundle/composer.json @@ -45,9 +45,6 @@ "symfony/form": "^4.4 || ^5.2", "twig/twig": "^2.12" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json index 6b19b4a6a10..8de64adee72 100644 --- a/src/Sylius/Bundle/CustomerBundle/composer.json +++ b/src/Sylius/Bundle/CustomerBundle/composer.json @@ -54,9 +54,6 @@ "symfony/dependency-injection": "^4.4 || ^5.2", "symfony/form": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index 3ed872ad98c..4b315c306e9 100644 --- a/src/Sylius/Bundle/InventoryBundle/composer.json +++ b/src/Sylius/Bundle/InventoryBundle/composer.json @@ -45,9 +45,6 @@ "symfony/dependency-injection": "^4.4 || ^5.2", "twig/twig": "^2.12" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json index a86623c9826..cb5ec2c66e0 100644 --- a/src/Sylius/Bundle/LocaleBundle/composer.json +++ b/src/Sylius/Bundle/LocaleBundle/composer.json @@ -45,9 +45,6 @@ "symfony/dependency-injection": "^4.4 || ^5.2", "twig/twig": "^2.12" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json index 29d9a1a8ab1..1171816817d 100644 --- a/src/Sylius/Bundle/MoneyBundle/composer.json +++ b/src/Sylius/Bundle/MoneyBundle/composer.json @@ -46,9 +46,6 @@ "symfony/form": "^4.4 || ^5.2", "twig/twig": "^2.12" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json index 62ad4dfde53..8e72e5f4aaa 100644 --- a/src/Sylius/Bundle/OrderBundle/composer.json +++ b/src/Sylius/Bundle/OrderBundle/composer.json @@ -48,9 +48,6 @@ "symfony/form": "^4.4 || ^5.2", "symfony/validator": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json index a40254c83f3..5290a7eab64 100644 --- a/src/Sylius/Bundle/PaymentBundle/composer.json +++ b/src/Sylius/Bundle/PaymentBundle/composer.json @@ -44,9 +44,6 @@ "symfony/browser-kit": "^4.4 || ^5.2", "symfony/dependency-injection": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json index cd01c2c1f3d..4e0423b482e 100644 --- a/src/Sylius/Bundle/PayumBundle/composer.json +++ b/src/Sylius/Bundle/PayumBundle/composer.json @@ -42,9 +42,6 @@ "phpspec/phpspec": "^7.1", "symfony/dependency-injection": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json index 4e885395d40..98192588ac9 100644 --- a/src/Sylius/Bundle/ProductBundle/composer.json +++ b/src/Sylius/Bundle/ProductBundle/composer.json @@ -44,9 +44,6 @@ "symfony/form": "^4.4 || ^5.2", "symfony/validator": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json index abd5a7d404c..a9e564a6d10 100644 --- a/src/Sylius/Bundle/PromotionBundle/composer.json +++ b/src/Sylius/Bundle/PromotionBundle/composer.json @@ -49,9 +49,6 @@ "symfony/form": "^4.4 || ^5.2", "symfony/validator": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json index d5660a6f700..b327988afd2 100644 --- a/src/Sylius/Bundle/ReviewBundle/composer.json +++ b/src/Sylius/Bundle/ReviewBundle/composer.json @@ -60,9 +60,6 @@ "symfony/swiftmailer-bundle": "^3.1", "symfony/validator": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/ShippingBundle/composer.json b/src/Sylius/Bundle/ShippingBundle/composer.json index 1c63a734228..ab28db721ea 100644 --- a/src/Sylius/Bundle/ShippingBundle/composer.json +++ b/src/Sylius/Bundle/ShippingBundle/composer.json @@ -49,9 +49,6 @@ "symfony/form": "^4.4 || ^5.2", "symfony/validator": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json index 29248532e47..569507002cd 100644 --- a/src/Sylius/Bundle/ShopBundle/composer.json +++ b/src/Sylius/Bundle/ShopBundle/composer.json @@ -42,9 +42,6 @@ "phpunit/phpunit": "^8.5", "symfony/dependency-injection": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json index aa30bcbda03..4942bf27d0b 100644 --- a/src/Sylius/Bundle/TaxationBundle/composer.json +++ b/src/Sylius/Bundle/TaxationBundle/composer.json @@ -47,9 +47,6 @@ "symfony/dependency-injection": "^4.4 || ^5.2", "symfony/form": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/TaxonomyBundle/composer.json b/src/Sylius/Bundle/TaxonomyBundle/composer.json index 6f17e3be2a0..03fbdf2e84c 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/composer.json +++ b/src/Sylius/Bundle/TaxonomyBundle/composer.json @@ -43,9 +43,6 @@ "phpunit/phpunit": "^8.5", "symfony/dependency-injection": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json index 97473f8d38c..741db37dd55 100644 --- a/src/Sylius/Bundle/UiBundle/composer.json +++ b/src/Sylius/Bundle/UiBundle/composer.json @@ -54,9 +54,6 @@ "symfony/form": "^4.4 || ^5.2", "twig/twig": "^2.12" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json index 7046a58a4c6..ec93d18b433 100644 --- a/src/Sylius/Bundle/UserBundle/composer.json +++ b/src/Sylius/Bundle/UserBundle/composer.json @@ -64,9 +64,6 @@ "suggest": { "hwi/oauth-bundle": "For OAuth integration" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Addressing/composer.json b/src/Sylius/Component/Addressing/composer.json index c29468d1c93..5e2ac19af33 100644 --- a/src/Sylius/Component/Addressing/composer.json +++ b/src/Sylius/Component/Addressing/composer.json @@ -34,9 +34,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Attribute/composer.json b/src/Sylius/Component/Attribute/composer.json index d10549eb684..b2dc15c674e 100644 --- a/src/Sylius/Component/Attribute/composer.json +++ b/src/Sylius/Component/Attribute/composer.json @@ -34,9 +34,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Channel/composer.json b/src/Sylius/Component/Channel/composer.json index d8741acdb2a..9f2017dd2a8 100644 --- a/src/Sylius/Component/Channel/composer.json +++ b/src/Sylius/Component/Channel/composer.json @@ -36,9 +36,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Core/composer.json b/src/Sylius/Component/Core/composer.json index 7f11f38da4c..3c2d6fea59f 100644 --- a/src/Sylius/Component/Core/composer.json +++ b/src/Sylius/Component/Core/composer.json @@ -58,9 +58,6 @@ "phpspec/phpspec": "^7.1", "symfony/property-access": "^4.4 || ^5.2" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Currency/composer.json b/src/Sylius/Component/Currency/composer.json index 28da13a2752..b060a52ac03 100644 --- a/src/Sylius/Component/Currency/composer.json +++ b/src/Sylius/Component/Currency/composer.json @@ -33,9 +33,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Customer/composer.json b/src/Sylius/Component/Customer/composer.json index 7828f58719d..b4681975f19 100644 --- a/src/Sylius/Component/Customer/composer.json +++ b/src/Sylius/Component/Customer/composer.json @@ -38,9 +38,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Inventory/composer.json b/src/Sylius/Component/Inventory/composer.json index b2623495854..c96d075623e 100644 --- a/src/Sylius/Component/Inventory/composer.json +++ b/src/Sylius/Component/Inventory/composer.json @@ -33,9 +33,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Locale/composer.json b/src/Sylius/Component/Locale/composer.json index b74f978228d..ead3b0d3c8a 100644 --- a/src/Sylius/Component/Locale/composer.json +++ b/src/Sylius/Component/Locale/composer.json @@ -34,9 +34,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Order/composer.json b/src/Sylius/Component/Order/composer.json index 85590a7f69d..92c3004c36d 100644 --- a/src/Sylius/Component/Order/composer.json +++ b/src/Sylius/Component/Order/composer.json @@ -34,9 +34,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Payment/composer.json b/src/Sylius/Component/Payment/composer.json index 30bbc96e4ff..0cf88747040 100644 --- a/src/Sylius/Component/Payment/composer.json +++ b/src/Sylius/Component/Payment/composer.json @@ -33,9 +33,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Product/composer.json b/src/Sylius/Component/Product/composer.json index 320ba0bbe01..9a40ad8f4ae 100644 --- a/src/Sylius/Component/Product/composer.json +++ b/src/Sylius/Component/Product/composer.json @@ -41,9 +41,6 @@ "suggest": { "ext-iconv": "For better performance than using Symfony Polyfill Component" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Promotion/composer.json b/src/Sylius/Component/Promotion/composer.json index f4b09204fbd..4a07f53e1ac 100644 --- a/src/Sylius/Component/Promotion/composer.json +++ b/src/Sylius/Component/Promotion/composer.json @@ -33,9 +33,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Review/composer.json b/src/Sylius/Component/Review/composer.json index 2909e63ed3f..bdbe6d69015 100644 --- a/src/Sylius/Component/Review/composer.json +++ b/src/Sylius/Component/Review/composer.json @@ -44,9 +44,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Shipping/composer.json b/src/Sylius/Component/Shipping/composer.json index a6060adaa66..fc260bae385 100644 --- a/src/Sylius/Component/Shipping/composer.json +++ b/src/Sylius/Component/Shipping/composer.json @@ -36,9 +36,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Taxation/composer.json b/src/Sylius/Component/Taxation/composer.json index ae06e930356..ca11bac05cf 100644 --- a/src/Sylius/Component/Taxation/composer.json +++ b/src/Sylius/Component/Taxation/composer.json @@ -35,9 +35,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/Taxonomy/composer.json b/src/Sylius/Component/Taxonomy/composer.json index 3c2f26f9b0f..7efba88ade5 100644 --- a/src/Sylius/Component/Taxonomy/composer.json +++ b/src/Sylius/Component/Taxonomy/composer.json @@ -34,9 +34,6 @@ "require-dev": { "phpspec/phpspec": "^7.1" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" diff --git a/src/Sylius/Component/User/composer.json b/src/Sylius/Component/User/composer.json index 5b7ce99b624..d8f7321289b 100644 --- a/src/Sylius/Component/User/composer.json +++ b/src/Sylius/Component/User/composer.json @@ -46,9 +46,6 @@ "suggest": { "ext-mbstring": "For better performance than using Symfony Polyfill Component" }, - "config": { - "bin-dir": "bin" - }, "extra": { "branch-alias": { "dev-master": "1.9-dev" From b8fb089bf21f17b6ac33f14773c04458574a4948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Thu, 20 Jan 2022 09:12:15 +0100 Subject: [PATCH 4/4] [Maintenance] Execute PHPUnit only if its config exists --- .github/workflows/packages.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 52dbe8ea9dc..89488d2d3a7 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -111,9 +111,24 @@ jobs: working-directory: "src/Sylius/${{ matrix.package }}" run: vendor/bin/phpspec run --ansi --no-interaction -f dot + - + name: Check the existance of phpunit.xml.dist + id: phpunit_xml_dist_existance_check + uses: andstor/file-existence-action@v1 + with: + files: "src/Sylius/${{ matrix.package }}/phpunit.xml.dist" + + - + name: Check the existance of phpunit.xml + id: phpunit_xml_existance_check + uses: andstor/file-existence-action@v1 + with: + files: "src/Sylius/${{ matrix.package }}/phpunit.xml" + - name: Run PHPUnit working-directory: "src/Sylius/${{ matrix.package }}" + if: steps.phpunit_xml_dist_existance_check.outputs.files_exists == 'true' || steps.phpunit_xml_existance_check.outputs.files_exists == 'true' run: vendor/bin/phpunit --colors=always notify-about-build-failure: