<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58276] branches/6.4: Build/Test Tools: Make use of new reusable workflows.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58276">58276</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58276","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-31 19:23:44 +0000 (Fri, 31 May 2024)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Make use of new reusable workflows.

This updates the 6.4 branch to utilize the new reusable workflows in trunk introduced in <a href="https://core.trac.wordpress.org/changeset/58165">[58165]</a>.

This also includes backports for a some additional improvements and bug fixes that are necessary for the local development environment to continue working long term:
- Migrating to Docker Compose V2 (<a href="https://core.trac.wordpress.org/ticket/60901">#60901</a>).
- Removing the `version` property from `docker-compose.yml` (<a href="https://core.trac.wordpress.org/ticket/59416">#59416</a>).
- Improvements to how artifacts and comments for Playground testing are generated.
- Removing SVN related commands causing failures (<a href="https://core.trac.wordpress.org/ticket/61216">#61216</a>).
- Updating the `actions/github-scripts` action to the latest version.

Merges <a href="https://core.trac.wordpress.org/changeset/57918">[57918]</a>, <a href="https://core.trac.wordpress.org/changeset/58157">[58157]</a>, <a href="https://core.trac.wordpress.org/changeset/57124">[57124]</a>, <a href="https://core.trac.wordpress.org/changeset/57125">[57125]</a>, <a href="https://core.trac.wordpress.org/changeset/57249">[57249]</a> to the 6.4 branch.

Props johnbillion, joemcgill, swissspidy, thelovekesh, narenin, mukesh27, JeffPaul, peterwilsoncc, zieladam, ockham, SergeyBiryukov, jorbin.
Fixes <a href="https://core.trac.wordpress.org/ticket/61216">#61216</a>. See <a href="https://core.trac.wordpress.org/ticket/60901">#60901</a>, <a href="https://core.trac.wordpress.org/ticket/61101">#61101</a>, <a href="https://core.trac.wordpress.org/ticket/59416">#59416</a>, <a href="https://core.trac.wordpress.org/ticket/59805">#59805</a>, <a href="https://core.trac.wordpress.org/ticket/61213">#61213</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches64githubworkflowscodingstandardsyml">branches/6.4/.github/workflows/coding-standards.yml</a></li>
<li><a href="#branches64githubworkflowsendtoendtestsyml">branches/6.4/.github/workflows/end-to-end-tests.yml</a></li>
<li><a href="#branches64githubworkflowsjavascripttestsyml">branches/6.4/.github/workflows/javascript-tests.yml</a></li>
<li><a href="#branches64githubworkflowsperformanceyml">branches/6.4/.github/workflows/performance.yml</a></li>
<li><a href="#branches64githubworkflowsphpcompatibilityyml">branches/6.4/.github/workflows/php-compatibility.yml</a></li>
<li><a href="#branches64githubworkflowsphpunittestsyml">branches/6.4/.github/workflows/phpunit-tests.yml</a></li>
<li><a href="#branches64dockercomposeyml">branches/6.4/docker-compose.yml</a></li>
<li><a href="#branches64toolslocalenvscriptsdockerjs">branches/6.4/tools/local-env/scripts/docker.js</a></li>
<li><a href="#branches64toolslocalenvscriptsinstalljs">branches/6.4/tools/local-env/scripts/install.js</a></li>
<li><a href="#branches64toolslocalenvscriptsstartjs">branches/6.4/tools/local-env/scripts/start.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branches64githubworkflowstestbuildprocessesyml">branches/6.4/.github/workflows/test-build-processes.yml</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branches64githubworkflowsbuildyml">branches/6.4/.github/workflows/build.yml</a></li>
<li><a href="#branches64githubworkflowsphpunittestsrunyml">branches/6.4/.github/workflows/phpunit-tests-run.yml</a></li>
<li><a href="#branches64githubworkflowstestnpmyml">branches/6.4/.github/workflows/test-npm.yml</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches64">branches/6.4/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.4
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.4 2024-05-31 18:34:20 UTC (rev 58275)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.4  2024-05-31 19:23:44 UTC (rev 58276)
</ins><a id="branches64"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.4</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:56974,56978,56984,56987,56990-56992,56996,56999,57003,57009,57012-57013,57018-57019,57021-57022,57028-57029,57032-57034,57036,57044,57046,57048,57054,57063,57066-57067,57069,57075,57081,57084,57086,57089,57093,57102,57127,57129,57142,57147,57151,57163,57212,57275-57277,57296,57306,57357,57388-57389,57537,57568,57667,57678,57903,57931
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:56974,56978,56984,56987,56990-56992,56996,56999,57003,57009,57012-57013,57018-57019,57021-57022,57028-57029,57032-57034,57036,57044,57046,57048,57054,57063,57066-57067,57069,57075,57081,57084,57086,57089,57093,57102,57124-57125,57127,57129,57142,57147,57151,57163,57212,57249,57275-57277,57296,57306,57357,57388-57389,57537,57568,57667,57678,57903,57918,57931,58157
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches64githubworkflowsbuildyml"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/6.4/.github/workflows/build.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/build.yml  2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/build.yml    2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,67 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-name: Build WordPress
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-# Cancels all previous workflow runs for pull requests that have not completed.
-concurrency:
-  # The concurrency group contains the workflow name and the branch name for pull requests
-  # or the commit hash for any other events.
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-# Disable permissions for all available scopes by default.
-# Any needed permissions should be configured at the job level.
-permissions: {}
-
-# Exposes WordPress builds as a GitHub artifact to enable 
-# previewing Pull Requests inside WordPress Playground.
-# 
-# @see https://github.com/WordPress/wordpress-playground/pull/700
-# @see https://github.com/WordPress/wordpress-develop/pull/5481
-jobs:
-  build-wordpress:
-    name: Upload WordPress build as an artifact
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    timeout-minutes: 20
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-
-      - name: Install npm Dependencies
-        run: npm ci
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Zip WordPress build
-        run: cd build && zip -r wordpress.zip .
-
-      - name: Upload the build directory as GitHub artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        if: always()
-        with:
-            name: wordpress-build-${{ github.event_name == 'pull_request' && github.event.number || github.sha }}
-            path: build/wordpress.zip
-            if-no-files-found: error
</del></span></pre></div>
<a id="branches64githubworkflowscodingstandardsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/.github/workflows/coding-standards.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/coding-standards.yml       2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/coding-standards.yml 2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,133 +46,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px">   # Runs PHP coding standards checks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
-  # Violations are reported inline with annotations.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up PHP.
-  # - Configures caching for PHPCS scans.
-  # - Installs Composer dependencies.
-  # - Make Composer packages available globally.
-  # - Runs PHPCS on the full codebase with warnings suppressed.
-  # - Generate a report for displaying issues as pull request annotations.
-  # - Runs PHPCS on the `tests` directory without warnings suppressed.
-  # - Generate a report for displaying `test` directory issues as pull request annotations.
-  # - Ensures version-controlled files are not modified or deleted.
</del><span class="cx" style="display: block; padding: 0 10px">   phpcs:
</span><span class="cx" style="display: block; padding: 0 10px">     name: PHP coding standards
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    runs-on: ubuntu-latest
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    timeout-minutes: 20
</del><span class="cx" style="display: block; padding: 0 10px">     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2.25.4
-        with:
-          php-version: 'latest'
-          coverage: none
-          tools: cs2pr
-
-      # This date is used to ensure that the PHPCS cache is cleared at least once every week.
-      # http://man7.org/linux/man-pages/man1/date.1.html
-      - name: "Get last Monday's date"
-        id: get-date
-        run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
-
-      - name: Cache PHPCS scan cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: |
-            .cache/phpcs-src.json
-            .cache/phpcs-tests.json
-          key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}
-
-      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
-      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
-      - name: Install Composer dependencies
-        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
-        with:
-          custom-cache-suffix: ${{ steps.get-date.outputs.date }}
-
-      - name: Make Composer packages available globally
-        run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
-
-      - name: Run PHPCS on all Core files
-        id: phpcs-core
-        run: phpcs -n --report-full --cache=./.cache/phpcs-src.json --report-checkstyle=./.cache/phpcs-report.xml
-
-      - name: Show PHPCS results in PR
-        if: ${{ always() && steps.phpcs-core.outcome == 'failure' }}
-        run: cs2pr ./.cache/phpcs-report.xml
-
-      - name: Check test suite files for warnings
-        id: phpcs-tests
-        run: phpcs tests --report-full --cache=./.cache/phpcs-tests.json --report-checkstyle=./.cache/phpcs-tests-report.xml
-
-      - name: Show test suite scan results in PR
-        if: ${{ always() && steps.phpcs-tests.outcome == 'failure' }}
-        run: cs2pr ./.cache/phpcs-tests-report.xml
-
-      - name: Ensure version-controlled files are not modified during the tests
-        run: git diff --exit-code
-
</del><span class="cx" style="display: block; padding: 0 10px">   # Runs the JavaScript coding standards checks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
-  # JSHint violations are not currently reported inline with annotations.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up Node.js.
-  # - Logs debug information about the GitHub Action runner.
-  # - Installs npm dependencies.
-  # - Run the WordPress JSHint checks.
-  # - Ensures version-controlled files are not modified or deleted.
</del><span class="cx" style="display: block; padding: 0 10px">   jshint:
</span><span class="cx" style="display: block; padding: 0 10px">     name: JavaScript coding standards
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    runs-on: ubuntu-latest
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    timeout-minutes: 20
</del><span class="cx" style="display: block; padding: 0 10px">     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    env:
-      PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          git --version
-          svn --version
-
-      - name: Install npm Dependencies
-        run: npm ci
-
-      - name: Run JSHint
-        run: npm run grunt jshint
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
</del><span class="cx" style="display: block; padding: 0 10px">   slack-notifications:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Slack Notifications
</span><span class="cx" style="display: block; padding: 0 10px">     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     steps:
</span><span class="cx" style="display: block; padding: 0 10px">       - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
</ins><span class="cx" style="display: block; padding: 0 10px">         with:
</span><span class="cx" style="display: block; padding: 0 10px">           retries: 2
</span><span class="cx" style="display: block; padding: 0 10px">           retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches64githubworkflowsendtoendtestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/.github/workflows/end-to-end-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/end-to-end-tests.yml       2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/end-to-end-tests.yml 2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,108 +36,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px">   # Runs the end-to-end test suite.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
-  # Performs the following steps:
-  # - Sets environment variables.
-  # - Checks out the repository.
-  # - Sets up Node.js.
-  # - Logs debug information about the GitHub Action runner.
-  # - Installs npm dependencies.
-  # - Install Playwright browsers.
-  # - Builds WordPress to run from the `build` directory.
-  # - Starts the WordPress Docker container.
-  # - Logs the running Docker containers.
-  # - Logs Docker debug information (about both the Docker installation within the runner and the WordPress container).
-  # - Install WordPress within the Docker container.
-  # - Install Gutenberg.
-  # - Run the E2E tests.
-  # - Ensures version-controlled files are not modified or deleted.
</del><span class="cx" style="display: block; padding: 0 10px">   e2e-tests:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    name: E2E Tests with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
-    runs-on: ubuntu-latest
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    name: Test with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    timeout-minutes: 20
</del><span class="cx" style="display: block; padding: 0 10px">     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="cx" style="display: block; padding: 0 10px">     strategy:
</span><span class="cx" style="display: block; padding: 0 10px">       fail-fast: false
</span><span class="cx" style="display: block; padding: 0 10px">       matrix:
</span><span class="cx" style="display: block; padding: 0 10px">         LOCAL_SCRIPT_DEBUG: [ true, false ]
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    with:
+      LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    steps:
-      - name: Configure environment variables
-        run: |
-          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
-          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
-
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-          locale -a
-
-      - name: Install npm Dependencies
-        run: npm ci
-
-      - name: Install Playwright browsers
-        run: npx playwright install --with-deps
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Start Docker environment
-        run: |
-          npm run env:start
-
-      - name: Log running Docker containers
-        run: docker ps -a
-
-      - name: Docker debug information
-        run: |
-          docker -v
-          docker-compose -v
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
-
-      - name: Install WordPress
-        env:
-          LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
-        run: npm run env:install
-
-      - name: Install Gutenberg
-        run: npm run env:cli -- plugin install gutenberg --path=/var/www/${{ env.LOCAL_DIR }}
-
-      - name: Run E2E tests
-        run: npm run test:e2e
-
-      - name: Archive debug artifacts (screenshots, HTML snapshots)
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        if: always()
-        with:
-            name: failures-artifacts
-            path: artifacts
-            if-no-files-found: ignore
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
</del><span class="cx" style="display: block; padding: 0 10px">   slack-notifications:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Slack Notifications
</span><span class="cx" style="display: block; padding: 0 10px">     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">       )
</span><span class="cx" style="display: block; padding: 0 10px">     steps:
</span><span class="cx" style="display: block; padding: 0 10px">       - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
</ins><span class="cx" style="display: block; padding: 0 10px">         with:
</span><span class="cx" style="display: block; padding: 0 10px">           retries: 2
</span><span class="cx" style="display: block; padding: 0 10px">           retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches64githubworkflowsjavascripttestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/.github/workflows/javascript-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/javascript-tests.yml       2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/javascript-tests.yml 2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,50 +44,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px">   # Runs the QUnit tests for WordPress.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up Node.js.
-  # - Logs debug information about the GitHub Action runner.
-  # - Installs npm dependencies.
-  # - Run the WordPress QUnit tests.
-  # - Ensures version-controlled files are not modified or deleted.
</del><span class="cx" style="display: block; padding: 0 10px">   test-js:
</span><span class="cx" style="display: block; padding: 0 10px">     name: QUnit Tests
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    runs-on: ubuntu-latest
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    timeout-minutes: 20
</del><span class="cx" style="display: block; padding: 0 10px">     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          git --version
-          svn --version
-
-      - name: Install npm Dependencies
-        run: npm ci
-
-      - name: Run QUnit tests
-        run: npm run grunt qunit:compiled
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
</del><span class="cx" style="display: block; padding: 0 10px">   slack-notifications:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Slack Notifications
</span><span class="cx" style="display: block; padding: 0 10px">     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     steps:
</span><span class="cx" style="display: block; padding: 0 10px">       - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
</ins><span class="cx" style="display: block; padding: 0 10px">         with:
</span><span class="cx" style="display: block; padding: 0 10px">           retries: 2
</span><span class="cx" style="display: block; padding: 0 10px">           retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches64githubworkflowsperformanceyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/.github/workflows/performance.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/performance.yml    2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/performance.yml      2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,252 +29,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Any needed permissions should be configured at the job level.
</span><span class="cx" style="display: block; padding: 0 10px"> permissions: {}
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-env:
-  PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
-
-  # Performance testing should be performed in an environment reflecting a standard production environment.
-  LOCAL_WP_DEBUG: false
-  LOCAL_SCRIPT_DEBUG: false
-  LOCAL_SAVEQUERIES: false
-  LOCAL_WP_DEVELOPMENT_MODE: "''"
-  LOCAL_PHP: "8.2-fpm"
-
-  # This workflow takes two sets of measurements â€” one for the current commit,
-  # and another against a consistent version that is used as a baseline measurement.
-  # This is done to isolate variance in measurements caused by the GitHub runners
-  # from differences caused by code changes between commits. The BASE_TAG value here
-  # represents the version being used for baseline measurements. It should only be
-  # changed if we want to normalize results against a different baseline.
-  BASE_TAG: '6.1.1'
-  LOCAL_DIR: build
-  TARGET_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || '' }}
-  TARGET_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
-
</del><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px">   # Runs the performance test suite.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
-  # Performs the following steps:
-  # - Configure environment variables.
-  # - Checkout repository.
-  # - Set up Node.js.
-  # - Log debug information.
-  # - Install npm dependencies.
-  # - Install Playwright browsers.
-  # - Build WordPress.
-  # - Start Docker environment.
-  # - Log running Docker containers.
-  # - Docker debug information.
-  # - Install WordPress.
-  # - Install WordPress Importer plugin.
-  # - Import mock data.
-  # - Update permalink structure.
-  # - Install MU plugin.
-  # - Run performance tests (current commit).
-  # - Print performance tests results.
-  # - Check out target commit (target branch or previous commit).
-  # - Switch Node.js versions if necessary.
-  # - Install npm dependencies.
-  # - Build WordPress.
-  # - Run performance tests (previous/target commit).
-  # - Print target performance tests results.
-  # - Reset to original commit.
-  # - Switch Node.js versions if necessary.
-  # - Install npm dependencies.
-  # - Set the environment to the baseline version.
-  # - Run baseline performance tests.
-  # - Print baseline performance tests results.
-  # - Compare results with base.
-  # - Add workflow summary.
-  # - Set the base sha.
-  # - Set commit details.
-  # - Publish performance results.
-  # - Ensure version-controlled files are not modified or deleted.
-  # - Dispatch workflow run.
</del><span class="cx" style="display: block; padding: 0 10px">   performance:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Run performance tests
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    runs-on: ubuntu-latest
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-performance.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ! contains( github.event.before, '00000000' ) }}
+    with:
+      php-version: '8.2'
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    steps:
-      - name: Configure environment variables
-        run: |
-          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
-          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
-
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-          locale -a
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Install Playwright browsers
-        run: npx playwright install --with-deps
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Start Docker environment
-        run: |
-          npm run env:start
-
-      - name: Log running Docker containers
-        run: docker ps -a
-
-      - name: Docker debug information
-        run: |
-          docker -v
-          docker-compose -v
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
-
-      - name: Install WordPress
-        run: npm run env:install
-
-      - name: Install WordPress Importer plugin
-        run: npm run env:cli -- plugin install wordpress-importer --activate --path=/var/www/${{ env.LOCAL_DIR }}
-
-      - name: Import mock data
-        run: |
-          curl -O https://raw.githubusercontent.com/WordPress/theme-test-data/b9752e0533a5acbb876951a8cbb5bcc69a56474c/themeunittestdata.wordpress.xml
-          npm run env:cli -- import themeunittestdata.wordpress.xml --authors=create --path=/var/www/${{ env.LOCAL_DIR }}
-          rm themeunittestdata.wordpress.xml
-
-      - name: Update permalink structure
-        run: |
-          npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path=/var/www/${{ env.LOCAL_DIR }}
-
-      - name: Install MU plugin
-        run: |
-          mkdir ./${{ env.LOCAL_DIR }}/wp-content/mu-plugins
-          cp ./tests/performance/wp-content/mu-plugins/server-timing.php ./${{ env.LOCAL_DIR }}/wp-content/mu-plugins/server-timing.php
-
-      - name: Run performance tests (current commit)
-        run: npm run test:performance
-
-      - name: Print performance tests results
-        run: node ./tests/performance/results.js
-
-      - name: Check out target commit (target branch or previous commit)
-        run: |
-          if [[ -z "$TARGET_REF" ]]; then
-            git fetch -n origin $TARGET_SHA
-          else
-            git fetch -n origin $TARGET_REF
-          fi
-          git reset --hard $TARGET_SHA
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Run target performance tests (base/previous commit)
-        env:
-          TEST_RESULTS_PREFIX: before
-        run: npm run test:performance
-
-      - name: Print target performance tests results
-        env:
-          TEST_RESULTS_PREFIX: before
-        run: node ./tests/performance/results.js
-
-      - name: Reset to original commit
-        run: git reset --hard $GITHUB_SHA
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Set the environment to the baseline version
-        run: |
-          npm run env:cli -- core update --version=${{ env.BASE_TAG }} --force --path=/var/www/${{ env.LOCAL_DIR }}
-          npm run env:cli -- core version --path=/var/www/${{ env.LOCAL_DIR }}
-
-      - name: Run baseline performance tests
-        env:
-          TEST_RESULTS_PREFIX: base
-        run: npm run test:performance
-
-      - name: Print baseline performance tests results
-        env:
-          TEST_RESULTS_PREFIX: base
-        run: node ./tests/performance/results.js
-
-      - name: Compare results with base
-        run: node ./tests/performance/compare-results.js ${{ runner.temp }}/summary.md
-
-      - name: Add workflow summary
-        run: cat ${{ runner.temp }}/summary.md >> $GITHUB_STEP_SUMMARY
-
-      - name: Set the base sha
-        # Only needed when publishing results.
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
-        id: base-sha
-        with:
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            script: |
-                const baseRef = await github.rest.git.getRef({ owner: context.repo.owner, repo: context.repo.repo, ref: 'tags/${{ env.BASE_TAG }}' });
-                return baseRef.data.object.sha;
-
-      - name: Set commit details
-        # Only needed when publishing results.
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
-        id: commit-timestamp
-        with:
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            script: |
-                const commit_details = await github.rest.git.getCommit({ owner: context.repo.owner, repo: context.repo.repo, commit_sha: context.sha });
-                return parseInt((new Date( commit_details.data.author.date ).getTime() / 1000).toFixed(0))
-
-      - name: Publish performance results
-        # Only publish results on pushes to trunk.
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
-        env:
-            BASE_SHA: ${{ steps.base-sha.outputs.result }}
-            COMMITTED_AT: ${{ steps.commit-timestamp.outputs.result }}
-            CODEVITALS_PROJECT_TOKEN: ${{ secrets.CODEVITALS_PROJECT_TOKEN }}
-            HOST_NAME: "www.codevitals.run"
-        run: node ./tests/performance/log-results.js $CODEVITALS_PROJECT_TOKEN trunk $GITHUB_SHA $BASE_SHA $COMMITTED_AT $HOST_NAME
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
</del><span class="cx" style="display: block; padding: 0 10px">   slack-notifications:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Slack Notifications
</span><span class="cx" style="display: block; padding: 0 10px">     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     steps:
</span><span class="cx" style="display: block; padding: 0 10px">       - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
</ins><span class="cx" style="display: block; padding: 0 10px">         with:
</span><span class="cx" style="display: block; padding: 0 10px">           retries: 2
</span><span class="cx" style="display: block; padding: 0 10px">           retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches64githubworkflowsphpcompatibilityyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/.github/workflows/php-compatibility.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/php-compatibility.yml      2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/php-compatibility.yml        2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,79 +40,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> permissions: {}
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">   # Runs PHP compatibility testing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
-  # Violations are reported inline with annotations.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up PHP.
-  # - Logs debug information.
-  # - Configures caching for PHP compatibility scans.
-  # - Installs Composer dependencies.
-  # - Make Composer packages available globally.
-  # - Runs the PHP compatibility tests.
-  # - Generate a report for displaying issues as pull request annotations.
-  # - Ensures version-controlled files are not modified or deleted.
</del><span class="cx" style="display: block; padding: 0 10px">   php-compatibility:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Check PHP compatibility
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    runs-on: ubuntu-latest
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-php-compatibility.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    timeout-minutes: 20
</del><span class="cx" style="display: block; padding: 0 10px">     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2.25.4
-        with:
-          php-version: '7.4'
-          coverage: none
-          tools: cs2pr
-
-      - name: Log debug information
-        run: |
-          composer --version
-
-      # This date is used to ensure that the PHP compatibility cache is cleared at least once every week.
-      # http://man7.org/linux/man-pages/man1/date.1.html
-      - name: "Get last Monday's date"
-        id: get-date
-        run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
-
-      - name: Cache PHP compatibility scan cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: .cache/phpcompat.json
-          key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }}
-
-      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
-      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
-      - name: Install Composer dependencies
-        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
-        with:
-          custom-cache-suffix: ${{ steps.get-date.outputs.date }}
-
-      - name: Make Composer packages available globally
-        run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
-
-      - name: Run PHP compatibility tests
-        id: phpcs
-        run: phpcs --standard=phpcompat.xml.dist --report-full --report-checkstyle=./.cache/phpcs-compat-report.xml
-
-      - name: Show PHPCompatibility results in PR
-        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
-        run: cs2pr ./.cache/phpcs-compat-report.xml
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
</del><span class="cx" style="display: block; padding: 0 10px">   slack-notifications:
</span><span class="cx" style="display: block; padding: 0 10px">     name: Slack Notifications
</span><span class="cx" style="display: block; padding: 0 10px">     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     steps:
</span><span class="cx" style="display: block; padding: 0 10px">       - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
</ins><span class="cx" style="display: block; padding: 0 10px">         with:
</span><span class="cx" style="display: block; padding: 0 10px">           retries: 2
</span><span class="cx" style="display: block; padding: 0 10px">           retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches64githubworkflowsphpunittestsrunyml"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/6.4/.github/workflows/phpunit-tests-run.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/phpunit-tests-run.yml      2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/phpunit-tests-run.yml        2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,188 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-##
-# A callable workflow that runs the PHPUnit test suite with the specified configuration.
-##
-name: Run PHPUnit tests
-
-on:
-  workflow_call:
-    inputs:
-      os:
-        description: 'Operating system to run tests on'
-        required: false
-        type: 'string'
-        default: 'ubuntu-latest'
-      php:
-        description: 'The version of PHP to use, in the format of X.Y'
-        required: true
-        type: 'string'
-      db-type:
-        description: 'Database type. Valid types are mysql and mariadb'
-        required: false
-        type: 'string'
-        default: 'mysql'
-      db-version:
-        description: 'Database version'
-        required: false
-        type: 'string'
-        default: '8.0'
-      multisite:
-        description: 'Whether to run tests as multisite'
-        required: false
-        type: 'boolean'
-        default: false
-      memcached:
-        description: 'Whether to test with memcached enabled'
-        required: false
-        type: 'boolean'
-        default: false
-      phpunit-config:
-        description: 'The PHPUnit configuration file to use'
-        required: false
-        type: 'string'
-        default: 'phpunit.xml.dist'
-      report:
-        description: 'Whether to report results to WordPress.org Hosting Tests'
-        required: false
-        type: 'boolean'
-        default: false
-env:
-  LOCAL_PHP: ${{ inputs.php }}-fpm
-  LOCAL_DB_TYPE: ${{ inputs.db-type }}
-  LOCAL_DB_VERSION: ${{ inputs.db-version }}
-  LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
-  PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
-  PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
-
-jobs:
-  # Runs the PHPUnit tests for WordPress.
-  #
-  # Performs the following steps:
-  # - Sets environment variables.
-  # - Checks out the repository.
-  # - Sets up Node.js.
-  # - Sets up PHP.
-  # - Installs Composer dependencies.
-  # - Installs npm dependencies
-  # - Logs general debug information about the runner.
-  # - Logs Docker debug information (about the Docker installation within the runner).
-  # - Starts the WordPress Docker container.
-  # - Logs the running Docker containers.
-  # - Logs debug information about what's installed within the WordPress Docker containers.
-  # - Install WordPress within the Docker container.
-  # - Run the PHPUnit tests.
-  # - Ensures version-controlled files are not modified or deleted.
-  # - Checks out the WordPress Test reporter repository.
-  # - Submit the test results to the WordPress.org host test results.
-  phpunit-tests:
-    name: PHP ${{ inputs.php }} / ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }}
-    runs-on: ${{ inputs.os }}
-    timeout-minutes: 20
-
-    steps:
-      - name: Configure environment variables
-        run: |
-          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
-          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
-
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      ##
-      # This allows Composer dependencies to be installed using a single step.
-      #
-      # Since the tests are currently run within the Docker containers where the PHP version varies,
-      # the same PHP version needs to be configured for the action runner machine so that the correct
-      # dependency versions are installed and cached.
-      ##
-      - name: Set up PHP
-        uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2.25.4
-        with:
-          php-version: '${{ inputs.php }}'
-          coverage: none
-
-      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
-      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
-      - name: Install Composer dependencies
-        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
-        with:
-          custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: General debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-          composer --version
-          locale -a
-
-      - name: Docker debug information
-        run: |
-          docker -v
-          docker-compose -v
-
-      - name: Start Docker environment
-        run: |
-          npm run env:start
-
-      - name: Log running Docker containers
-        run: docker ps -a
-
-      - name: WordPress Docker container debug information
-        run: |
-          docker-compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
-
-      - name: Install WordPress
-        run: npm run env:install
-
-      - name: Run PHPUnit tests
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}
-
-      - name: Run AJAX tests
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
-
-      - name: Run ms-files tests as a multisite install
-        if: ${{ inputs.multisite }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ms-files
-
-      - name: Run external HTTP tests
-        if: ${{ ! inputs.multisite }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group external-http
-
-      # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
-      - name: Run (Xdebug) tests
-        if: ${{ inputs.php != '8.3' }}
-        run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
-      - name: Checkout the WordPress Test Reporter
-        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && inputs.report }}
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          repository: 'WordPress/phpunit-test-runner'
-          path: 'test-runner'
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Submit test results to the WordPress.org host test results
-        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && inputs.report }}
-        env:
-          WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
-        run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
</del></span></pre></div>
<a id="branches64githubworkflowsphpunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/.github/workflows/phpunit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/phpunit-tests.yml  2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/phpunit-tests.yml    2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,12 +31,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> permissions: {}
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  #
</del><span class="cx" style="display: block; padding: 0 10px">   # Creates a PHPUnit test job for each PHP/MySQL combination.
</span><span class="cx" style="display: block; padding: 0 10px">   #
</span><span class="cx" style="display: block; padding: 0 10px">   test-with-mysql:
</span><span class="cx" style="display: block; padding: 0 10px">     name: PHP ${{ matrix.php }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><span class="cx" style="display: block; padding: 0 10px">     secrets: inherit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">   #
</span><span class="cx" style="display: block; padding: 0 10px">   test-with-mariadb:
</span><span class="cx" style="display: block; padding: 0 10px">     name: PHP ${{ matrix.php }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px">     permissions:
</span><span class="cx" style="display: block; padding: 0 10px">       contents: read
</span><span class="cx" style="display: block; padding: 0 10px">     secrets: inherit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     steps:
</span><span class="cx" style="display: block; padding: 0 10px">       - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
</ins><span class="cx" style="display: block; padding: 0 10px">         with:
</span><span class="cx" style="display: block; padding: 0 10px">           retries: 2
</span><span class="cx" style="display: block; padding: 0 10px">           retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches64githubworkflowstestbuildprocessesymlfromrev58275branches64githubworkflowstestnpmyml"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: branches/6.4/.github/workflows/test-build-processes.yml (from rev 58275, branches/6.4/.github/workflows/test-npm.yml)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/test-build-processes.yml                           (rev 0)
+++ branches/6.4/.github/workflows/test-build-processes.yml     2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,135 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+name: Test Build Processes
+
+on:
+  push:
+    branches:
+      - trunk
+      - '3.[7-9]'
+      - '[4-9].[0-9]'
+    tags:
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
+  pull_request:
+    branches:
+      - trunk
+      - '3.[7-9]'
+      - '[4-9].[0-9]'
+    paths:
+      # These files configure npm. Changes could affect the outcome.
+      - 'package*.json'
+      # JavaScript files are built using npm.
+      - '**.js'
+      # CSS and SCSS files are built using npm.
+      - '**.scss'
+      - '**.css'
+      # Changes to workflow files should always verify all workflows are successful.
+      - '.github/workflows/**.yml'
+  workflow_dispatch:
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for pull requests
+  # or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+jobs:
+  # Tests the WordPress Core build process on multiple operating systems.
+  test-core-build-process:
+    name: Core running from ${{ matrix.directory }}
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
+    permissions:
+      contents: read
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+        directory: [ 'src', 'build' ]
+        include:
+          # Only prepare artifacts for Playground once.
+          - os: ubuntu-latest
+            directory: 'build'
+            prepare-playground: true
+    with:
+      os: ${{ matrix.os }}
+      directory: ${{ matrix.directory }}
+      prepare-playground: ${{ matrix.prepare-playground && matrix.prepare-playground || false }}
+      test-emoji: false
+
+  # Tests the WordPress Core build process on MacOS.
+  #
+  # This is separate from the job above in order to use stricter conditions when determining when to run.
+  # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate.
+  #
+  # The `matrix` and `runner` contexts are not available for use within `if` expressions. So there is
+  # currently no way to determine the OS being used on a given job.
+  # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
+  test-core-build-process-macos:
+    name: Core running from ${{ matrix.directory }}
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
+    permissions:
+      contents: read
+    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-latest ]
+        directory: [ 'src', 'build' ]
+    with:
+      os: ${{ matrix.os }}
+      directory: ${{ matrix.directory }}
+      test-emoji: false
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
+    needs: [ test-core-build-process, test-core-build-process-macos ]
+    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' }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
+
+  failed-workflow:
+    name: Failed workflow tasks
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
+    if: |
+      always() &&
+      github.repository == 'WordPress/wordpress-develop' &&
+      github.event_name != 'pull_request' &&
+      github.run_attempt < 2 &&
+      (
+        contains( needs.*.result, 'cancelled' ) ||
+        contains( needs.*.result, 'failure' )
+      )
+
+    steps:
+      - name: Dispatch workflow run
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          retries: 2
+          retry-exempt-status-codes: 418
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'failed-workflow.yml',
+              ref: 'trunk',
+              inputs: {
+                run_id: '${{ github.run_id }}'
+              }
+            });
</ins></span></pre></div>
<a id="branches64githubworkflowstestnpmyml"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/6.4/.github/workflows/test-npm.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/.github/workflows/test-npm.yml       2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/.github/workflows/test-npm.yml 2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,227 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-name: Test npm
-
-on:
-  push:
-    branches:
-      - trunk
-      - '3.[7-9]'
-      - '[4-9].[0-9]'
-    tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-  pull_request:
-    branches:
-      - trunk
-      - '3.[7-9]'
-      - '[4-9].[0-9]'
-    paths:
-      # These files configure npm. Changes could affect the outcome.
-      - 'package*.json'
-      # JavaScript files are built using npm.
-      - '**.js'
-      # CSS and SCSS files are built using npm.
-      - '**.scss'
-      - '**.css'
-      # Changes to workflow files should always verify all workflows are successful.
-      - '.github/workflows/**.yml'
-  workflow_dispatch:
-
-# Cancels all previous workflow runs for pull requests that have not completed.
-concurrency:
-  # The concurrency group contains the workflow name and the branch name for pull requests
-  # or the commit hash for any other events.
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-# Disable permissions for all available scopes by default.
-# Any needed permissions should be configured at the job level.
-permissions: {}
-
-env:
-  PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
-
-jobs:
-  # Verifies that installing npm dependencies and building WordPress works as expected.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up Node.js.
-  # - Logs debug information about the GitHub Action runner.
-  # - Installs npm dependencies.
-  # - Builds WordPress to run from the `build` directory.
-  # - Cleans up after building WordPress to the `build` directory.
-  # - Ensures version-controlled files are not modified or deleted.
-  # - Builds WordPress to run from the `src` directory.
-  # - Cleans up after building WordPress to the `src` directory.
-  # - Ensures version-controlled files are not modified or deleted.
-  test-npm:
-    name: Test npm on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-    timeout-minutes: 20
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest, windows-latest ]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          check-latest: true
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-
-      - name: Install npm Dependencies
-        run: npm ci
-
-      - name: Build WordPress in /src
-        run: npm run build:dev
-
-      - name: Clean after building in /src
-        run: npm run grunt clean -- --dev
-
-      - name: Ensure version-controlled files are not modified or deleted during building and cleaning
-        run: git diff --exit-code
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Clean after building
-        run: npm run grunt clean
-
-      - name: Ensure version-controlled files are not modified or deleted during building and cleaning
-        run: git diff --exit-code
-
-  # Verifies that installing npm dependencies and building WordPress works as expected on MacOS.
-  #
-  # This is separate from the job above in order to use stricter conditions about when to run.
-  # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate.
-  #
-  # The `matrix` and `runner` contexts are not available for use within `if` expressions. So there is
-  # currently no way to determine the OS being used on a given job.
-  # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up Node.js.
-  # - Logs debug information about the GitHub Action runner.
-  # - Installs npm dependencies.
-  # - Builds WordPress to run from the `build` directory.
-  # - Cleans up after building WordPress to the `build` directory.
-  # - Ensures version-controlled files are not modified or deleted.
-  # - Builds WordPress to run from the `src` directory.
-  # - Cleans up after building WordPress to the `src` directory.
-  # - Ensures version-controlled files are not modified or deleted.
-  test-npm-macos:
-    name: Test npm on MacOS
-    runs-on: macos-latest
-    permissions:
-      contents: read
-    timeout-minutes: 30
-    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-        with:
-          show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
-        with:
-          node-version-file: '.nvmrc'
-          check-latest: true
-          cache: npm
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-
-      - name: Install npm Dependencies
-        run: npm ci
-
-      - name: Build WordPress in /src
-        run: npm run build:dev
-
-      - name: Clean after building in /src
-        run: npm run grunt clean -- --dev
-
-      - name: Ensure version-controlled files are not modified or deleted during building and cleaning
-        run: git diff --exit-code
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Clean after building
-        run: npm run grunt clean
-
-      - name: Ensure version-controlled files are not modified or deleted during building and cleaning
-        run: git diff --exit-code
-
-  slack-notifications:
-    name: Slack Notifications
-    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
-    permissions:
-      actions: read
-      contents: read
-    needs: [ test-npm, test-npm-macos ]
-    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' }}
-    secrets:
-      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
-      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
-      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
-      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
-
-  failed-workflow:
-    name: Failed workflow tasks
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-    needs: [ slack-notifications ]
-    if: |
-      always() &&
-      github.repository == 'WordPress/wordpress-develop' &&
-      github.event_name != 'pull_request' &&
-      github.run_attempt < 2 &&
-      (
-        contains( needs.*.result, 'cancelled' ) ||
-        contains( needs.*.result, 'failure' )
-      )
-
-    steps:
-      - name: Dispatch workflow run
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
-        with:
-          retries: 2
-          retry-exempt-status-codes: 418
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: 'failed-workflow.yml',
-              ref: 'trunk',
-              inputs: {
-                run_id: '${{ github.run_id }}'
-              }
-            });
</del></span></pre></div>
<a id="branches64dockercomposeyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/docker-compose.yml   2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/docker-compose.yml     2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-version: '3.7'
-
</del><span class="cx" style="display: block; padding: 0 10px"> services:
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">   ##
</span></span></pre></div>
<a id="branches64toolslocalenvscriptsdockerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/tools/local-env/scripts/docker.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/tools/local-env/scripts/docker.js    2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/tools/local-env/scripts/docker.js      2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,4 +5,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dotenvExpand.expand( dotenv.config() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Execute any docker-compose command passed to this script.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+execSync( 'docker compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
</ins></span></pre></div>
<a id="branches64toolslocalenvscriptsinstalljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/tools/local-env/scripts/install.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/tools/local-env/scripts/install.js   2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/tools/local-env/scripts/install.js     2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string} cmd The WP-CLI command to run.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_cli( cmd ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        execSync( `docker-compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ execSync( `docker compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,6 +55,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function install_wp_importer() {
</span><span class="cx" style="display: block; padding: 0 10px">        const testPluginDirectory = 'tests/phpunit/data/plugins/wordpress-importer';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        execSync( `docker-compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
-       execSync( `docker-compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ execSync( `docker compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
+       execSync( `docker compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches64toolslocalenvscriptsstartjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.4/tools/local-env/scripts/start.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.4/tools/local-env/scripts/start.js     2024-05-31 18:34:20 UTC (rev 58275)
+++ branches/6.4/tools/local-env/scripts/start.js       2024-05-31 19:23:44 UTC (rev 58276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
</span><span class="cx" style="display: block; padding: 0 10px">        ? 'wordpress-develop memcached'
</span><span class="cx" style="display: block; padding: 0 10px">        : 'wordpress-develop';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-execSync( `docker-compose up -d ${containers}`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+execSync( `docker compose up -d ${containers}`, { stdio: 'inherit' } );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // If Docker Toolbox is being used, we need to manually forward LOCAL_PORT to the Docker VM.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( process.env.DOCKER_TOOLBOX_INSTALL_PATH ) {
</span></span></pre>
</div>
</div>

</body>
</html>