From c0252b06744fef638915cf683a0a42a865f11c60 Mon Sep 17 00:00:00 2001 From: Lance Willett Date: Tue, 4 Aug 2026 16:47:24 -0700 Subject: [PATCH] Build/Test Tools: Extend the PHPUnit runner variable to the v1 and v2 workflows. [62891] added the `runs-on` override to `reusable-phpunit-tests-v3.yml` alone, so only branches calling that workflow can be redirected. Branches 4.7 through 5.1 call `reusable-phpunit-tests-v1.yml` and branches 5.2 through 5.8 call `reusable-phpunit-tests-v2.yml`, both at `@trunk`. Neither workflow reads the variable, so a repository or organization variable has no effect on those twelve branches. This applies the same one-line change to both. With `RUNNERS_NAME` unset, jobs run on `inputs.os` exactly as before, so there is no change by default. Fixes #65749. --- .github/workflows/reusable-phpunit-tests-v1.yml | 2 +- .github/workflows/reusable-phpunit-tests-v2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-phpunit-tests-v1.yml b/.github/workflows/reusable-phpunit-tests-v1.yml index bd720d7da30ca..13c87c62671f8 100644 --- a/.github/workflows/reusable-phpunit-tests-v1.yml +++ b/.github/workflows/reusable-phpunit-tests-v1.yml @@ -85,7 +85,7 @@ jobs: # - Run the PHPUnit tests. test-php: name: PHP ${{ inputs.php }} / ${{ inputs.multisite && ' Multisite' || 'Single site' }}${{ inputs.split_slow && ' slow tests' || '' }}${{ inputs.memcached && ' with memcached' || '' }} - runs-on: ${{ inputs.os }} + runs-on: ${{ vars.RUNNERS_NAME || inputs.os }} timeout-minutes: 20 permissions: contents: read diff --git a/.github/workflows/reusable-phpunit-tests-v2.yml b/.github/workflows/reusable-phpunit-tests-v2.yml index 84c05862d4a43..15dea5fc31efa 100644 --- a/.github/workflows/reusable-phpunit-tests-v2.yml +++ b/.github/workflows/reusable-phpunit-tests-v2.yml @@ -87,7 +87,7 @@ jobs: # - Ensures version-controlled files are not modified or deleted. test-php: name: PHP ${{ inputs.php }} / ${{ inputs.multisite && ' Multisite' || 'Single Site' }}${{ inputs.split_slow && ' slow tests' || '' }}${{ inputs.memcached && ' with memcached' || '' }} - runs-on: ${{ inputs.os }} + runs-on: ${{ vars.RUNNERS_NAME || inputs.os }} timeout-minutes: 20 permissions: contents: read