Merge branch 'WordPress:trunk' into trac-22225/date-i18n-day-number-ordinals

Author: jayaddison

.git-blame-ignore-revs

@@ -61,4 +61,14 @@ d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
 a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
 
 # 6.9 Coding Standards
+d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
+c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
 cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
+3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
+b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
+ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
+08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
+e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
+8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
+87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
+db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

.github/dependabot.yml

@@ -45,8 +45,7 @@ permissions: {}
 jobs:
   check-for-built-file-changes:
     name: Check built files
-    # 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 ) }}
+    if: ${{ github.repository == 'wordpress/wordpress-develop' }}
     uses: ./.github/workflows/reusable-check-built-files.yml
     permissions:
       contents: read

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

@@ -9,9 +9,10 @@ on:
       - '3.[89]'
       - '[4-9].[0-9]'
     tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-      - '!3.7.[0-9]+'
+      - '3.[89]'
+      - '3.[89].[0-9]+'
+      - '[4-9].[0-9]'
+      - '[4-9].[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk
@@ -54,15 +55,15 @@ jobs:
     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]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   # Runs the JavaScript coding standards checks.
   jshint:
     name: Coding standards
     uses: ./.github/workflows/reusable-coding-standards-javascript.yml
     permissions:
       contents: read
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   slack-notifications:
     name: Slack Notifications

.github/workflows/coding-standards.yml

@@ -160,7 +160,7 @@ jobs:
         if: ${{ steps.artifact-check.outputs.exists == 'true' }}
         working-directory: 'pr-repo'
         run: |
-          git commit -m "Automation: Updating built files with changes. [dependabot skip]"
+          git commit -m "Automation: Updating built files with changes."
 
       - name: Push changes
         if: ${{ steps.artifact-check.outputs.exists == 'true' }}

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

@@ -8,10 +8,10 @@ on:
       - '5.[3-9]'
       - '[6-9].[0-9]'
     tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-      - '![34].[0-9].[0-9]+'
-      - '!5.[0-2].[0-9]+'
+      - '5.[3-9]'
+      - '5.[3-9].[0-9]+'
+      - '[6-9]+.[0-9]'
+      - '[6-9]+.[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk
@@ -60,7 +60,7 @@ jobs:
     uses: ./.github/workflows/reusable-end-to-end-tests.yml
     permissions:
       contents: read
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:

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

@@ -8,9 +8,10 @@ on:
       - '3.[89]'
       - '[4-9].[0-9]'
     tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-      - '!3.7.[0-9]+'
+      - '3.[89]'
+      - '3.[89].[0-9]+'
+      - '[4-9].[0-9]'
+      - '[4-9].[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk
@@ -55,7 +56,7 @@ jobs:
     uses: ./.github/workflows/reusable-javascript-tests.yml
     permissions:
       contents: read
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   slack-notifications:
     name: Slack Notifications

.github/workflows/javascript-tests.yml

@@ -1,6 +1,7 @@
 name: Local Docker Environment
 
 on:
+  # Local Docker environment testing was introduced in WordPress 6.8.
   push:
     branches:
       - trunk
@@ -109,6 +110,9 @@ jobs:
             db-version: '9.4'
           - php: '7.3'
             db-version: '9.4'
+          # No PHP 8.5 + Memcached support yet.
+          - php: '8.5'
+            memcached: true
 
     with:
       os: ${{ matrix.os }}

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

@@ -1,16 +1,17 @@
 name: Performance Tests
 
 on:
+  # Performance testing was introduced in WordPress 6.2.
   push:
     branches:
       - trunk
       - '6.[2-9]'
       - '[7-9].[0-9]'
     tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-      - '![45].[0-9].[0-9]+'
-      - '!6.[01].[0-9]+'
+      - '6.[2-9]'
+      - '6.[2-9].[0-9]+'
+      - '[7-9].[0-9]'
+      - '[7-9].[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk
@@ -53,7 +54,7 @@ jobs:
   determine-matrix:
     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' ) }}
+    if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ! contains( github.event.before, '00000000' ) }}
     permissions:
       actions: read
     env:

.github/workflows/performance.yml

@@ -8,10 +8,10 @@ on:
       - '5.[5-9]'
       - '[6-9].[0-9]'
     tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-      - '![34].[0-9].[0-9]+'
-      - '!5.[0-4].[0-9]+'
+      - '5.[5-9]'
+      - '5.[5-9].[0-9]+'
+      - '[6-9].[0-9]'
+      - '[6-9].[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk
@@ -47,7 +47,7 @@ jobs:
     uses: ./.github/workflows/reusable-php-compatibility.yml
     permissions:
       contents: read
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   slack-notifications:
     name: Slack Notifications