Merge branch 'trunk' into add/wpcomsh-wpcloud-testing

.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',

.github/files/gh-autorelease/files/autorelease.sh

@@ -28,7 +28,7 @@ elif [[ "$GITHUB_REF" == "refs/heads/trunk" ]]; then
 	fi
 	ROLLING_MODE=true
 	CURRENT_VER=$( sed -nEe 's/^## \[?([^]]*)\]? - .*/\1/;T;p;q' CHANGELOG.md || true )
-	GIT_SUFFIX=$( git log -1 --format=%h . )
+	GIT_SUFFIX=$( git log -1 --format="%ct.g%h" . )
 	TAG="$CURRENT_VER+rolling.$GIT_SUFFIX"
 else
 	echo "::error::Expected GITHUB_REF like \`refs/tags/v1.2.3\` or \`refs/tags/1.2.3\` or \`refs/heads/trunk\` for rolling releases, got \`$GITHUB_REF\`"

.github/workflows/block-performance.yml

@@ -36,7 +36,7 @@ jobs:
           npx playwright install chromium --with-deps
           npm run build:packages
 
-      - name: Setup tools for J
+      - name: Setup tools for Jetpack
         uses: ./.github/actions/tool-setup
 
       - name: Build Production Jetpack

.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: