Merge branch 'WordPress:trunk' into tinymce-paste-letter-ol

Author: sabernhardt

.env.example

@@ -67,3 +67,8 @@ LOCAL_WP_TESTS_DOMAIN=example.org
 
 # The URL to use when running e2e tests.
 WP_BASE_URL=http://localhost:${LOCAL_PORT}
+
+##
+# This silences the tips output by the dotenv package.
+##
+DOTENV_CONFIG_QUIET=true

.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

@@ -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/**'
@@ -43,6 +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
@@ -23,6 +24,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,19 +51,19 @@ 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]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   # 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
-    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
@@ -96,7 +99,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           retries: 2
           retry-exempt-status-codes: 418

.github/workflows/coding-standards.yml

@@ -43,7 +43,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifact
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const artifacts = await github.rest.actions.listWorkflowRunArtifacts( {
@@ -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 }}
@@ -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
@@ -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,15 +56,17 @@ 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
-    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:
         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 }}
 
@@ -99,7 +103,7 @@ jobs:
       )
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           retries: 2
           retry-exempt-status-codes: 418

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

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Rerun a workflow
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           retries: 15
           retry-exempt-status-codes: 418