From 8f89bf254d3975a4dc263660dd724dedc21511b5 Mon Sep 17 00:00:00 2001
From: Andrew Millington <andrew@noexceptions.io>
Date: Tue, 6 Jun 2023 21:44:02 +0100
Subject: [PATCH 1/3] Remove skipping of test

---
 tests/Utils/CryptKeyTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/Utils/CryptKeyTest.php b/tests/Utils/CryptKeyTest.php
index 7190864c6..b9c53b660 100644
--- a/tests/Utils/CryptKeyTest.php
+++ b/tests/Utils/CryptKeyTest.php
@@ -54,9 +54,6 @@ public function testKeyString()
 
     public function testUnsupportedKeyType()
     {
-        if (\str_starts_with(\phpversion(), '8.0')) {
-            $this->markTestSkipped('Cannot generate key on PHP 8.0 runner. Investigating');
-        }
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Unable to read key');
 

From 75f210dc7be2d81761a9a13a79b5e9b3c5f37b3c Mon Sep 17 00:00:00 2001
From: Andrew Millington <andrew@noexceptions.io>
Date: Tue, 6 Jun 2023 21:56:22 +0100
Subject: [PATCH 2/3] Run 8.0 tests on Ubuntu 20.04

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6b82845c8..1d17d65c5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,13 +8,17 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
-        php: [8.0, 8.1, 8.2]
+        php: [8.1, 8.2]
+        os: [ubuntu-22.04]
         stability: [prefer-lowest, prefer-stable]
+        include:
+          - os: ubuntu-20.04
+            php: 8.0
+
+    runs-on: ${{ matrix.os }}
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 

From a10cde3daf65c0c19c5c8a05e9b40cd435016489 Mon Sep 17 00:00:00 2001
From: Andrew Millington <andrew@noexceptions.io>
Date: Tue, 6 Jun 2023 21:58:33 +0100
Subject: [PATCH 3/3] Include stability preferences for composer install

---
 .github/workflows/tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1d17d65c5..ade0c245b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,6 +17,10 @@ jobs:
         include:
           - os: ubuntu-20.04
             php: 8.0
+            stability: prefer-lowest
+          - os: ubuntu-20.04
+            php: 8.0
+            stability: prefer-stable
 
     runs-on: ${{ matrix.os }}