Merge branch '1.9' into 1.10

* 1.9: Generate changelog for v1.9.1 [Maintenance] Simplify GitHub action workflow
Sylius · May 16, 2022 · eda0aed · eda0aed
2 parents bfdbc9f + c4abb98
commit eda0aed
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ on:
 jobs:
     tests:
         runs-on: ubuntu-latest
-        name: "PHP ${{ matrix.php }}${{ matrix.symfony != '' && format(', Symfony {0}', matrix.symfony) || '' }}${{ matrix.twig != '' && format(', Twig {0}', matrix.twig) || '' }}${{ matrix.winzou != '' && format(', Winzou {0}', matrix.winzou) || '' }}${{ matrix.composer-flags != '' && format(', Composer with {0}', matrix.composer-flags) || '' }}"
+        name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, Twig ${{ matrix.twig }}"
         strategy:
             fail-fast: false
             matrix:
@@ -48,8 +48,8 @@ jobs:
             -
                 name: Install dependencies
                 run: |
-                    composer update ${{ matrix.composer-flags }} --no-scripts
-                    (cd src/Component && composer update ${{ matrix.composer-flags }} --no-scripts)
+                    composer update --no-scripts
+                    (cd src/Component && composer update --no-scripts)
 
             -
                 name: Prepare test application
@@ -98,22 +98,22 @@ jobs:
             -
                 name: Run smoke tests without friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle packages
                 run: |
-                    composer remove friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts ${{ matrix.composer-flags }}
+                    composer remove friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts
                     (cd src/Bundle/test && bin/console cache:clear --env=test_without_fosrest)
-                    composer require friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts ${{ matrix.composer-flags }}
+                    composer require friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts
 
             -
                 name: Run lint container without winzou/state-machine-bundle package
                 run: |
-                    composer remove winzou/state-machine-bundle --no-scripts ${{ matrix.composer-flags }}
+                    composer remove winzou/state-machine-bundle --no-scripts
                     (cd src/Bundle/test && bin/console cache:clear --env=test_without_state_machine)
                     (cd src/Bundle/test && bin/console lint:container --env=test_without_state_machine)
-                    composer require winzou/state-machine-bundle --no-scripts ${{ matrix.composer-flags }}
+                    composer require winzou/state-machine-bundle --no-scripts
 
             -
                 name: Run lint container without twig/twig package
                 run: |
-                    composer remove symfony/twig-bundle --no-scripts ${{ matrix.composer-flags }}
+                    composer remove symfony/twig-bundle --no-scripts
                     (cd src/Bundle/test && bin/console cache:clear --env=test_without_twig)
                     (cd src/Bundle/test && bin/console lint:container --env=test_without_twig)
-                    composer require symfony/twig-bundle --no-scripts ${{ matrix.composer-flags }}
+                    composer require symfony/twig-bundle --no-scripts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 ## CHANGELOG
 
+### v1.9.1 (2022-05-16)
+
+#### Details
+
+- [#407](https://github.com/Sylius/SyliusResourceBundle/issues/407) [1.8] Correct branch alias to 1.8-dev ([@Zales0123](https://github.com/Zales0123))
+- [#409](https://github.com/Sylius/SyliusResourceBundle/issues/409) Document supported branches ([@Zales0123](https://github.com/Zales0123))
+- [#416](https://github.com/Sylius/SyliusResourceBundle/issues/416) Revert "Bump Pagerfanta from 2.x to 3.x" ([@lchrusciel](https://github.com/lchrusciel))
+- [#417](https://github.com/Sylius/SyliusResourceBundle/issues/417) Revert "Revert "Bump Pagerfanta from 2.x to 3.x"" ([@lchrusciel](https://github.com/lchrusciel))
+- [#424](https://github.com/Sylius/SyliusResourceBundle/issues/424) Run lint container instead of smoke test for twig ([@loic425](https://github.com/loic425))
+- [#425](https://github.com/Sylius/SyliusResourceBundle/issues/425) Run lint container for state machine instead of smoke tests ([@loic425](https://github.com/loic425))
+- [#432](https://github.com/Sylius/SyliusResourceBundle/issues/432) [Maintenance] Correct branch alias to 1.9-dev ([@lchrusciel](https://github.com/lchrusciel))
+- [#446](https://github.com/Sylius/SyliusResourceBundle/issues/446) [Maintenance] Simplify GitHub action workflow ([@lchrusciel](https://github.com/lchrusciel))
+
 ### v1.9.0 (2022-04-07)
 
 #### TL;DR