From 70ef2cd6bcd662b4cff0b8a5f8f05bbeffc72d7a Mon Sep 17 00:00:00 2001
From: tbradsha <32492176+tbradsha@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:52:05 -0600
Subject: [PATCH] Tests: Use Ubuntu 22.04 runner for PHP 7.0 tests (#39779)

* Pass runner from matrix to workflow

* Run PHP 7.0 tests on Ubuntu 22.04
---
 .github/files/generate-ci-matrix.php | 6 +++++-
 .github/workflows/tests.yml          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php
index 4688293fb60bb..15026f8b28d93 100755
--- a/.github/files/generate-ci-matrix.php
+++ b/.github/files/generate-ci-matrix.php
@@ -26,6 +26,9 @@
 	// {string} Name for the job. Required, and must be unique.
 	'name'                => null,
 
+	// {string} Runner name as found in https://github.com/actions/runner-images/.
+	'runner'              => 'ubuntu-latest',
+
 	// {string} Composer script for the job. Required.
 	'script'              => null,
 
@@ -68,9 +71,10 @@
 	);
 }
 
-// TODO: When WordPress 6.5 is no longer supported, this can be removed.
+// TODO: When WordPress 6.5 is no longer supported, this can be removed. Runs too slow on ubuntu-24.04 (ubuntu-latest).
 $matrix[] = array(
 	'name'                => 'PHP tests: PHP 7.0 WP previous',
+	'runner'              => 'ubuntu-22.04',
 	'script'              => 'test-php',
 	'php'                 => '7.0',
 	'wp'                  => 'previous',
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index caef4109236b8..65015806bd992 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,7 +27,7 @@ jobs:
 
   run-tests:
     name: ${{ matrix.name }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     needs: create-matrix
     services:
       database: