Merge branch 'trunk' into dependency-updates

Author: desrosj

.github/workflows/check-built-files.yml

@@ -19,6 +19,8 @@ on:
       - '**.sass'
       # These files configure npm and the task runner. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
       - 'tools/webpack/**'
@@ -46,3 +48,5 @@ jobs:
     # This prevents an unnecessary second run after changes are committed back because Dependabot always rebases and force pushes.
     if: ${{ github.repository == 'wordpress/wordpress-develop' && ( github.actor != 'dependabot[bot]' || github.event.commits < 2 ) }}
     uses: ./.github/workflows/reusable-check-built-files.yml
+    permissions:
+      contents: read

.github/workflows/coding-standards.yml

@@ -23,6 +23,8 @@ on:
       - '**.php'
       # These files configure npm. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
       # This file configures JSHint. Changes could affect the outcome.
@@ -48,15 +50,15 @@ permissions: {}
 jobs:
   # Runs the PHP coding standards checks.
   phpcs:
-    name: PHP coding standards
+    name: Coding standards
     uses: ./.github/workflows/reusable-coding-standards-php.yml
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
 
   # Runs the JavaScript coding standards checks.
   jshint:
-    name: JavaScript coding standards
+    name: Coding standards
     uses: ./.github/workflows/reusable-coding-standards-javascript.yml
     permissions:
       contents: read

.github/workflows/commit-built-file-changes.yml

@@ -123,7 +123,7 @@ jobs:
           rm -f private-key.pem
 
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         if: ${{ steps.artifact-check.outputs.exists == 'true' }}
         with:
           repository: ${{ github.event.workflow_run.head_repository.full_name }}

.github/workflows/end-to-end-tests.yml

@@ -24,6 +24,8 @@ on:
       - '**.php'
       # These files configure npm and the task runner. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
       - 'tools/webpack/**'
@@ -54,7 +56,7 @@ env:
 jobs:
   # Runs the end-to-end test suite.
   e2e-tests:
-    name: Test with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
+    name: ${{ matrix.label }}
     uses: ./.github/workflows/reusable-end-to-end-tests.yml
     permissions:
       contents: read
@@ -63,6 +65,8 @@ jobs:
       fail-fast: false
       matrix:
         LOCAL_SCRIPT_DEBUG: [ true, false ]
+        # A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI.
+        label: [ 'E2E Tests' ]
     with:
       LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
 

.github/workflows/install-testing.yml

@@ -47,7 +47,7 @@ jobs:
     permissions:
       contents: read
     secrets: inherit
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     with:
       wp-version: ${{ inputs.wp-version }}
 
@@ -63,7 +63,7 @@ jobs:
     permissions:
       contents: read
     runs-on: ${{ matrix.os }}
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     timeout-minutes: 10
     needs: [ build-test-matrix ]
     strategy:
@@ -94,11 +94,12 @@ jobs:
           - db-version: '9.0'
           - db-version: '9.1'
           - db-version: '9.2'
+          - db-version: '9.3'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
 
     services:
       database:
@@ -117,7 +118,7 @@ jobs:
 
     steps:
       - name: Set up PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
+        uses: shivammathur/setup-php@20529878ed81ef8e78ddf08b480401e6101a850f # v2.35.3
         with:
           php-version: '${{ matrix.php }}'
           coverage: none

.github/workflows/javascript-tests.yml

@@ -21,6 +21,8 @@ on:
       - '**.js'
       # These files configure npm and the task runner. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
       - 'tools/webpack/**'

.github/workflows/local-docker-environment.yml

@@ -17,6 +17,8 @@ on:
       - 'Gruntfile.js'
       - 'webpack.config.js'
       - 'tools/webpack/**'
+      - '.npmrc'
+      - '.nvmrc'
       # These files configure Composer. Changes could affect the local environment.
       - 'composer.*'
       # These files define the versions to test.
@@ -41,6 +43,8 @@ on:
       - 'Gruntfile.js'
       - 'webpack.config.js'
       - 'tools/webpack/**'
+      - '.npmrc'
+      - '.nvmrc'
       # These files configure Composer. Changes could affect the local environment.
       - 'composer.*'
       # These files define the versions to test.
@@ -73,7 +77,7 @@ jobs:
     permissions:
       contents: read
     secrets: inherit
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     with:
       wp-version: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}
 
@@ -88,7 +92,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
-        memcached: [ false, true ]
+        memcached: [ false ]
         php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }}
         db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
 
@@ -99,11 +103,12 @@ jobs:
           - db-version: '9.0'
           - db-version: '9.1'
           - db-version: '9.2'
+          - db-version: '9.3'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
 
     with:
       os: ${{ matrix.os }}

.github/workflows/performance.yml

@@ -23,6 +23,8 @@ on:
       - '**.php'
       # These files configure npm and the task runner. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
       - 'tools/webpack/**'
@@ -52,7 +54,8 @@ jobs:
     name: Determine Matrix
     runs-on: ubuntu-24.04
     if: ${{ ( github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) ) && ! contains( github.event.before, '00000000' ) }}
-    permissions: {}
+    permissions:
+      actions: read
     env:
       TARGET_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
     outputs:
@@ -98,7 +101,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        memcached: [ true, false ]
+        memcached: [ false ]
         multisite: [ true, false ]
         subject: ${{ fromJson( needs.determine-matrix.outputs.subjects ) }}
     with:
@@ -116,8 +119,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        memcached: [ true, false ]
+        memcached: [ false ]
         multisite: [ true, false ]
+        # A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI.
         label: [ Compare ]
     with:
       memcached: ${{ matrix.memcached }}

.github/workflows/phpunit-tests.yml

@@ -25,6 +25,8 @@ on:
       - 'src/SECURITY.md'
       # These files configure npm and the task runner. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       - 'Gruntfile.js'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
@@ -63,7 +65,7 @@ jobs:
     permissions:
       contents: read
     secrets: inherit
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) ) }}
     strategy:
       fail-fast: false
       matrix:
@@ -140,7 +142,7 @@ jobs:
     permissions:
       contents: read
     secrets: inherit
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) ) }}
     strategy:
       fail-fast: false
       matrix:
@@ -184,35 +186,32 @@ jobs:
   # Because upstream support for innovation releases is dropped when a new one is released (including security updates),
   # only the most recent innovation version is tested.
   #
+  # MariaDB does not currently have a supported innovation release.
+  #
   test-innovation-releases:
     name: PHP ${{ matrix.php }}
     uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
     permissions:
       contents: read
     secrets: inherit
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) ) }}
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
-        db-type: [ 'mysql', 'mariadb' ]
-        db-version: [ '9.3', '11.7' ]
+        db-type: [ 'mysql' ]
+        db-version: [ '9.4' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
 
         exclude:
           # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
-          # Exclude version combinations that don't exist.
-          - db-type: 'mariadb'
-            db-version: '9.3'
-          - db-type: 'mysql'
-            db-version: '11.7'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -225,37 +224,100 @@ jobs:
       report: ${{ false }}
 
   #
-  # Runs specific individual test groups.
+  # Runs the HTML API test group.
+  #
+  # This test group runs separately due to the large number of tests that are skipped in this group while the
+  # HTML API is being developed. The skipped tests would otherwise cloud the results of all other test groups.
   #
   # These tests are run against the most recent LTS version of MySQL.
   #
-  specific-test-groups:
-    name: ${{ matrix.phpunit-test-groups }}
+  html-api-test-groups:
+    name: ${{ matrix.label }}
     uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
     permissions:
       contents: read
     secrets: inherit
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) ) }}
     strategy:
       fail-fast: false
       matrix:
         php: [ '7.2', '7.4', '8.0', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '8.4' ]
         phpunit-test-groups: [ 'html-api-html5lib-tests' ]
+        # A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI.
+        label: [ 'HTML API' ]
     with:
       php: ${{ matrix.php }}
       db-type: ${{ matrix.db-type }}
       db-version: ${{ matrix.db-version }}
       phpunit-test-groups: ${{ matrix.phpunit-test-groups }}
 
+  #
+  # Runs unit tests for forks.
+  #
+  # Because the majority of forks will belong to personal GitHub accounts (which are limited to just 20 concurrent jobs
+  # at any given time), forks only run a small subset of test combinations. This allows contributors to open pull
+  # requests back to their own forks for testing purposes without having to wait hours for workflow to complete.
+  #
+  limited-matrix-for-forks:
+    name: PHP ${{ matrix.php }}
+    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    permissions:
+      contents: read
+    secrets: inherit
+    if: ${{ ! startsWith( github.repository, 'WordPress/' ) && github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.2', '8.4' ]
+        db-version: [ '8.4', '11.8' ]
+        db-type: [ 'mysql', 'mariadb' ]
+        multisite: [ false ]
+
+        include:
+          # Include one multisite job for each database type.
+          - php: '8.4'
+            db-version: '8.4'
+            db-type: 'mysql'
+            multisite: true
+          - php: '8.4'
+            db-version: '11.8'
+            db-type: 'mariadb'
+            multisite: true
+          # Test with memcached.
+          - php: '8.4'
+            db-version: '8.4'
+            db-type: 'mysql'
+            multisite: true
+            memcached: true
+          # Run specific test groups once.
+          - php: '8.4'
+            db-version: '8.4'
+            db-type: 'mysql'
+            phpunit-test-groups: 'html-api-html5lib-tests'
+
+        exclude:
+          # Exclude PHP versions that are not supported by the database versions.
+          - db-type: 'mysql'
+            db-version: '11.8'
+          - db-type: 'mariadb'
+            db-version: '8.4'
+
+    with:
+      php: ${{ matrix.php }}
+      db-version: ${{ matrix.db-version }}
+      db-type: ${{ matrix.db-type }}
+      memcached: ${{ matrix.memcached || false }}
+      phpunit-test-groups: ${{ matrix.phpunit-test-groups || '' }}
+
   slack-notifications:
     name: Slack Notifications
     uses: ./.github/workflows/slack-notifications.yml
     permissions:
       actions: read
       contents: read
-    needs: [ test-with-mysql, test-with-mariadb, test-innovation-releases, specific-test-groups ]
+    needs: [ test-with-mysql, test-with-mariadb, test-innovation-releases, html-api-test-groups, limited-matrix-for-forks ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
       calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}