fix: Adjust composer requirements and build matrix

netlogix · Oct 24, 2023 · 947471a · 947471a
1 parent 45f1846
commit 947471a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 50 deletions.
diff --git a/.github/workflows/functionaltests.yml b/.github/workflows/functionaltests.yml
@@ -10,30 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        flow-version: [ 5.3, 6.3, 7.3, 8.0 ]
-        exclude:
-          # Disable Flow 5.3 and 6.3 on PHP 8.0, as only ^7.2 is supported
-          - php-version: 8.0
-            flow-version: 5.3
-          - php-version: 8.0
-            flow-version: 6.3
-          - php-version: 8.1
-            flow-version: 5.3
-          - php-version: 8.1
-            flow-version: 6.3
-
-          # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
-          - php-version: 7.2
-            flow-version: 7.3
-
-          # Disable Flow 8.0 on PHP 7, as 8.0 is required
-          - php-version: 7.2
-            flow-version: 8.0
-          - php-version: 7.3
-            flow-version: 8.0
-          - php-version: 7.4
-            flow-version: 8.0
+        php-version: [ 7.2, 7.3, 7.4 ]
+        flow-version: [ 5.3, 6.3 ]
 
     env:
       APP_ENV: true

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -10,30 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        flow-version: [ 5.3, 6.3, 7.3, 8.0 ]
-        exclude:
-          # Disable Flow 5.3 and 6.3 on PHP 8.0, as only ^7.2 is supported
-          - php-version: 8.0
-            flow-version: 5.3
-          - php-version: 8.0
-            flow-version: 6.3
-          - php-version: 8.1
-            flow-version: 5.3
-          - php-version: 8.1
-            flow-version: 6.3
-
-          # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
-          - php-version: 7.2
-            flow-version: 7.3
-
-          # Disable Flow 8.0 on PHP 7, as 8.0 is required
-          - php-version: 7.2
-            flow-version: 8.0
-          - php-version: 7.3
-            flow-version: 8.0
-          - php-version: 7.4
-            flow-version: 8.0
+        php-version: [ 7.2, 7.3, 7.4 ]
+        flow-version: [ 5.3, 6.3 ]
 
     env:
       APP_ENV: true

diff --git a/composer.json b/composer.json
@@ -4,8 +4,8 @@
     "type": "neos-package",
     "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0",
-        "neos/flow": "^5.3 || ^6.3 || ^7.0 || ^8.0",
+        "php": "^7.2",
+        "neos/flow": "^5.3 || ^6.3",
         "sentry/sdk": "^3.1"
     },
     "autoload": {