Merge branch 'trunk' of github.com:WordPress/wordpress-develop into 64098/update-name

Author: aaronjorbin

.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/workflows/coding-standards.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

.github/workflows/end-to-end-tests.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

.github/workflows/javascript-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

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

@@ -1,6 +1,7 @@
 name: Local Docker Environment
 
 on:
+  # Local Docker environment testing was introduced in WordPress 6.8.
   push:
     branches:
       - trunk

.github/workflows/performance.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

.github/workflows/php-compatibility.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

.github/workflows/phpunit-tests.yml

@@ -211,7 +211,7 @@ jobs:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mariadb' ]
-        db-version: [ '5.5', '10.3', '10.4', '10.5', '10.6', '10.11', '11.4', '11.8' ]
+        db-version: [ '5.5', '10.3', '10.5', '10.6', '10.11', '11.4', '11.8' ]
         multisite: [ false, true ]
         memcached: [ false ]
 
@@ -222,9 +222,6 @@ jobs:
           - event: pull_request
             php: '7.2'
             db-version: '10.3'
-          - event: pull_request
-            php: '7.2'
-            db-version: '10.4'
           - event: pull_request
             php: '7.2'
             db-version: '10.5'
@@ -243,9 +240,6 @@ jobs:
           - event: pull_request
             php: '7.3'
             db-version: '5.5'
-          - event: pull_request
-            php: '7.3'
-            db-version: '10.4'
           - event: pull_request
             php: '7.3'
             db-version: '10.5'
@@ -288,9 +282,6 @@ jobs:
           - event: pull_request
             php: '8.0'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.0'
-            db-version: '10.4'
           - event: pull_request
             php: '8.0'
             db-version: '10.6'
@@ -309,9 +300,6 @@ jobs:
           - event: pull_request
             php: '8.1'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.1'
-            db-version: '10.4'
           - event: pull_request
             php: '8.1'
             db-version: '10.5'
@@ -330,9 +318,6 @@ jobs:
           - event: pull_request
             php: '8.2'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.2'
-            db-version: '10.4'
           - event: pull_request
             php: '8.2'
             db-version: '10.5'
@@ -351,9 +336,6 @@ jobs:
           - event: pull_request
             php: '8.3'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.3'
-            db-version: '10.4'
           - event: pull_request
             php: '8.3'
             db-version: '10.5'
@@ -372,9 +354,6 @@ jobs:
           - event: pull_request
             php: '8.4'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.4'
-            db-version: '10.4'
           - event: pull_request
             php: '8.4'
             db-version: '10.5'
@@ -393,9 +372,6 @@ jobs:
           - event: pull_request
             php: '8.5'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.5'
-            db-version: '10.4'
           - event: pull_request
             php: '8.5'
             db-version: '10.5'

.github/workflows/pull-request-comments.yml

@@ -130,6 +130,20 @@ jobs:
             const fs = require( 'fs' );
             const issue_number = Number( fs.readFileSync( './NR' ) );
 
+            core.info( `Checking pull request #${issue_number}.` );
+
+            // Confirm that the pull request is still open before leaving a comment.
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: issue_number,
+            });
+
+            if ( pr.data.state !== 'open' ) {
+              core.info( 'The pull request has been closed. No comment will be left.' );
+              return;
+            }
+
             // Comments are only added after the first successful build. Check for the presence of a comment and bail early.
             const commentInfo = {
               owner: context.repo.owner,
@@ -141,6 +155,7 @@ jobs:
 
             for ( const currentComment of comments ) {
               if ( currentComment.user.type === 'Bot' && currentComment.body.includes( 'Test using WordPress Playground' ) ) {
+                core.info( 'A comment with instructions to test within a Playground instance already exists.' );
                 return;
               }
             };

.github/workflows/reusable-cleanup-pull-requests.yml

@@ -54,28 +54,36 @@ jobs:
 
             for (const ticket of fixedList) {
               const tracTicketUrl = `https://core.trac.wordpress.org/ticket/${ticket}`;
-              const corePrefix = `Core-${ticket}`;
+              const corePrefix = `core-${ticket}`;
 
               const query = `
                 query($searchQuery: String!) {
                   search(query: $searchQuery, type: ISSUE_ADVANCED, first: 20) {
                     nodes {
                       ... on PullRequest {
                         number
-                        state
+                        bodyText
                       }
                     }
                   }
                 }
               `;
 
-              const searchQuery = `repo:${context.repo.owner}/${context.repo.repo} is:pr is:open in:body ( "${tracTicketUrl}" OR "${corePrefix}" )`;
+              const searchQuery = `repo:${context.repo.owner}/${context.repo.repo} is:pr is:open ( "${tracTicketUrl}" OR "${corePrefix}" )`;
 
               const result = await github.graphql(query, {
                 searchQuery,
               });
 
-              prNumbers.push(...result.search.nodes.map(pr => pr.number));
+              // Since search queries will match anywhere for any activity on a pull request, the body specifically needs to be manually checked.
+              const matchingPRs = result.search.nodes
+                .filter(pr => {
+                  const bodyLower = pr.bodyText.toLowerCase();
+
+                  return bodyLower.includes(tracTicketUrl.toLowerCase()) || bodyLower.includes(corePrefix.toLowerCase());
+              }).map(pr => pr.number);
+
+              prNumbers.push(...matchingPRs);
             }
 
             return prNumbers;