From 59a6946a3f527a4d539a23d939311e89c5e45eb4 Mon Sep 17 00:00:00 2001
From: Owen Voke <development@voke.dev>
Date: Wed, 20 Jan 2021 14:03:54 +0000
Subject: [PATCH 1/2] ci: update to use stable dependencies

---
 .github/workflows/tests.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 04555cbf..b7efacd0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        tools: composer:v2
+        tools: composer
         coverage: none
 
     - name: Setup Problem Matches
@@ -41,13 +41,8 @@ jobs:
         echo "::add-matcher::${{ runner.tool_cache }}/php.json"
         echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-    - name: Install PHP 7 dependencies
+    - name: Install PHP dependencies
       run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
-      if: "matrix.php < 8"
-
-    - name: Install PHP 8 dependencies
-      run: composer update --${{ matrix.dependency-version }} --ignore-platform-req=php --no-interaction --no-progress --ansi
-      if: "matrix.php >= 8"
 
     - name: Unit Tests
       continue-on-error: ${{ matrix.prerelease }}

From 4559db5f849b4e876338a513ddfd044b98e5eae8 Mon Sep 17 00:00:00 2001
From: Owen Voke <development@voke.dev>
Date: Wed, 20 Jan 2021 14:05:50 +0000
Subject: [PATCH 2/2] ci: update to fail on PHP 8 errors

---
 .github/workflows/tests.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b7efacd0..5ef7ac4e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,22 +5,11 @@ on: ['push', 'pull_request']
 jobs:
   ci:
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.prerelease }}
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
         dependency-version: [prefer-lowest, prefer-stable]
-        prerelease: [false]
-        include:
-          - php: 8.0
-            os: ubuntu-latest
-            dependency-version: prefer-lowest
-            prerelease: true
-          - php: 8.0
-            os: ubuntu-latest
-            dependency-version: prefer-stable
-            prerelease: true
 
     name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
 
@@ -45,5 +34,4 @@ jobs:
       run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
 
     - name: Unit Tests
-      continue-on-error: ${{ matrix.prerelease }}
       run: vendor/bin/pest --colors=always