Merge pull request #516 from ergebnis/fix/php8

Fix: Stop running tests with composer/composer:^1 and php:^8
ergebnis · Aug 16, 2020 · 365fc2b · 365fc2b
2 parents 704974d + 9a7a1a0
commit 365fc2b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -44,9 +44,6 @@ branches:
           - "Tests (7.4, 2, highest)"
           - "Tests (7.4, 2, locked)"
           - "Tests (7.4, 2, lowest)"
-          - "Tests (8.0, 1, highest)"
-          - "Tests (8.0, 1, locked)"
-          - "Tests (8.0, 1, lowest)"
           - "Tests (8.0, 2, highest)"
           - "Tests (8.0, 2, locked)"
           - "Tests (8.0, 2, lowest)"

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -258,7 +258,6 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
-          - "8.0"
 
         composer-version:
           - "1"
@@ -269,6 +268,19 @@ jobs:
           - "locked"
           - "highest"
 
+        include:
+          - php-version: "8.0"
+            composer-version: "2"
+            dependencies: "lowest"
+
+          - php-version: "8.0"
+            composer-version: "2"
+            dependencies: "locked"
+
+          - php-version: "8.0"
+            composer-version: "2"
+            dependencies: "highest"
+
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.3.2"