Merge pull request #208 from Yoast/JRF/ghactions/dont-fail-on-8.4

GH Actions: update for branch-cut of PHP 8.4
Yoast · Nov 7, 2024 · 624efa1 · 624efa1
2 parents a4a261f + 400a93c
commit 624efa1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', 'nightly']
+        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', 'nightly']
 
     continue-on-error: ${{ matrix.php == 'nightly' }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         phpunit: ['auto']
         coverage: [true]
         experimental: [false]
@@ -82,6 +82,10 @@ jobs:
             phpunit: '9.3.0'
             coverage: true
             experimental: false
+          - php: '8.4'
+            phpunit: '9.6.21'
+            coverage: true
+            experimental: false
 
           # Experimental builds.
           - php: 'nightly'
@@ -209,6 +213,7 @@ jobs:
           # - PHPUnit 8 supports PHP 8.1 as of PHPUnit 8.5.19 (for our purposes).
           # - PHPUnit 8 supports PHP 8.2 as of PHPUnit 8.5.19 (for our purposes).
           # - PHPUnit 8 supports PHP 8.3 as of PHPUnit 8.5.19 (for our purposes).
+          # - PHPUnit 8 supports PHP 8.4 as of PHPUnit 8.5.40 (for our purposes).
           # - PHPUnit 8 does not support running code coverage on PHP 8.0 or higher.
           - php: '7.2'
             phpunit: '8.0'
@@ -224,9 +229,9 @@ jobs:
             phpunit: '8.5.12'
           - php: '8.0'
             phpunit: '8'
-          - php: '8.3'
-            phpunit: '8.5.19'
-          - php: '8.3'
+          - php: '8.4'
+            phpunit: '8.5.40'
+          - php: '8.4'
             phpunit: '8'
 
           # PHPUnit 9 is fully supported for the officially supported PHP versions.
@@ -235,6 +240,7 @@ jobs:
           # - PHPUnit 9 supports PHP 8.1 as of PHPUnit 9.5.8 (for our purposes).
           # - PHPUnit 9 supports PHP 8.2 as of PHPUnit 9.5.8 (for our purposes).
           # - PHPUnit 9 supports PHP 8.3 as of PHPUnit 9.5.8 (for our purposes).
+          # - PHPUnit 9 supports PHP 8.4 as of PHPUnit 9.6.21 (for our purposes).
           - php: '7.3'
             phpunit: '9.0'
             coverage: true
@@ -256,6 +262,10 @@ jobs:
             phpunit: '9.5.8'
           - php: '8.3'
             phpunit: '9'
+          - php: '8.4'
+            phpunit: '9.6.21'
+          - php: '8.4'
+            phpunit: '9'
             coverage: true
 
           # Experimental builds.