Merge pull request #85 from niels-nijens/add-symfony-6.4

Add Symfony 6.4 to GitHub Actions workflow
nijens · Mar 19, 2024 · 6c8af03 · 6c8af03
2 parents dbb62b9 + 5835b49
commit 6c8af03
Show file tree

Hide file tree

Showing 9 changed files with 358 additions and 351 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -9,8 +9,8 @@ jobs:
 
         strategy:
             matrix:
-                php-version: ['7.4', '8.0', '8.1', '8.2']
-                symfony-version: ['4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '6.0', '6.1', '6.2', '6.3']
+                php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+                symfony-version: ['4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '6.0', '6.1', '6.2', '6.3', '6.4']
                 test-options: ['']
                 coverage: [false]
                 include:
@@ -29,6 +29,8 @@ jobs:
                       symfony-version: '6.2'
                     - php-version: '7.4'
                       symfony-version: '6.3'
+                    - php-version: '7.4'
+                      symfony-version: '6.4'
                     - php-version: '8.0'
                       symfony-version: '5.0'
                     - php-version: '8.0'
@@ -37,6 +39,8 @@ jobs:
                       symfony-version: '6.2'
                     - php-version: '8.0'
                       symfony-version: '6.3'
+                    - php-version: '8.0'
+                      symfony-version: '6.4'
                     - php-version: '8.1'
                       symfony-version: '5.0'
                     - php-version: '8.1'
@@ -49,6 +53,12 @@ jobs:
                       symfony-version: '5.1'
                     - php-version: '8.2'
                       symfony-version: '5.2'
+                    - php-version: '8.3'
+                      symfony-version: '5.0'
+                    - php-version: '8.3'
+                      symfony-version: '5.1'
+                    - php-version: '8.3'
+                      symfony-version: '5.2'
 
         steps:
             - uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -17,7 +17,11 @@ ifndef version
 	@exit 1
 endif
 
-ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3),)
+ifeq ($(filter $(version),6.2 6.3 6.4),)
+	sed -i -e "s/\(\s\+\)\(handle_all_throwables:\)/\1# \2/" tests/Functional/App/config.yaml
+endif
+
+ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3 6.4),)
 	sed -i -e "s/\(\s\+\)# \(storage_id:\)/\1\2/" tests/Functional/App/config.yaml
 	sed -i -e "s/\(\s\+\)\(storage_factory_id:\)/\1# \2/" tests/Functional/App/config.yaml
 endif