<!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>[55482] branches/6.0: Build/Test Tools: Backport updates to GitHub Actions.</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/55482">55482</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/55482","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>2023-03-07 19:36:29 +0000 (Tue, 07 Mar 2023)</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: Backport updates to GitHub Actions.
This backports several changesets to GitHub Actions workflows. These changesets:
- address the deprecated notices related to `save-output` and `set-output` to ensure the workflows continue to run after these are removed.
- adds support for automatically retrying a failed workflow once.
- backports some Docker environment related tooling updates for the sake of consistency across branches.
Merges <a href="https://core.trac.wordpress.org/changeset/53628">[53628]</a>, <a href="https://core.trac.wordpress.org/changeset/53636">[53636]</a>, <a href="https://core.trac.wordpress.org/changeset/53736">[53736]</a>, <a href="https://core.trac.wordpress.org/changeset/53737">[53737]</a>, <a href="https://core.trac.wordpress.org/changeset/53895">[53895]</a>, <a href="https://core.trac.wordpress.org/changeset/53940">[53940]</a>, <a href="https://core.trac.wordpress.org/changeset/53947">[53947]</a>, <a href="https://core.trac.wordpress.org/changeset/54039">[54039]</a>, <a href="https://core.trac.wordpress.org/changeset/54096">[54096]</a>, <a href="https://core.trac.wordpress.org/changeset/54108">[54108]</a>, <a href="https://core.trac.wordpress.org/changeset/54293">[54293]</a>, <a href="https://core.trac.wordpress.org/changeset/54297">[54297]</a>, <a href="https://core.trac.wordpress.org/changeset/54313">[54313]</a>, <a href="https://core.trac.wordpress.org/changeset/54342">[54342]</a
>, <a href="https://core.trac.wordpress.org/changeset/54343">[54343]</a>, <a href="https://core.trac.wordpress.org/changeset/54371">[54371]</a>, <a href="https://core.trac.wordpress.org/changeset/54373">[54373]</a>, <a href="https://core.trac.wordpress.org/changeset/54511">[54511]</a>, <a href="https://core.trac.wordpress.org/changeset/54649">[54649]</a>, <a href="https://core.trac.wordpress.org/changeset/54650">[54650]</a>, <a href="https://core.trac.wordpress.org/changeset/54674">[54674]</a>, <a href="https://core.trac.wordpress.org/changeset/54678">[54678]</a>, <a href="https://core.trac.wordpress.org/changeset/54750">[54750]</a>, <a href="https://core.trac.wordpress.org/changeset/54851">[54851]</a>, <a href="https://core.trac.wordpress.org/changeset/54852">[54852]</a>, <a href="https://core.trac.wordpress.org/changeset/54856">[54856]</a>, <a href="https://core.trac.wordpress.org/changeset/54921">[54921]</a>, <a href="https://core.trac.wordpress.org/changeset/55152">[55152]</a> t
o the 6.0 branch.
See 55702, <a href="https://core.trac.wordpress.org/ticket/52708">#52708</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55700">#55700</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/56407">#56407</a>, <a href="https://core.trac.wordpress.org/ticket/56407">#56407</a>, <a href="https://core.trac.wordpress.org/ticket/56528">#56528</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/54695">#54695</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/5
5652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/56820">#56820</a>, <a href="https://core.trac.wordpress.org/ticket/56820">#56820</a>, <a href="https://core.trac.wordpress.org/ticket/56816">#56816</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>, <a href="https://core.trac.wordpress.org/ticket/56820">#56820</a>, <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>, <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>, <a href="https://core.trac.wordpress.org/ticket/53841">#53841</a>, <a href="https://core.trac.wordpress.org/ticket/57148">#57148</a>, <a href="https://core.trac.wordpress.org/ticket/57572">#57572</a>, <a href="https://core.trac.wordpress.org/ticket/56682">#56682</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches60env">branches/6.0/.env</a></li>
<li><a href="#branches60githubworkflowscodingstandardsyml">branches/6.0/.github/workflows/coding-standards.yml</a></li>
<li><a href="#branches60githubworkflowsendtoendtestsyml">branches/6.0/.github/workflows/end-to-end-tests.yml</a></li>
<li><a href="#branches60githubworkflowsjavascripttestsyml">branches/6.0/.github/workflows/javascript-tests.yml</a></li>
<li><a href="#branches60githubworkflowsphpcompatibilityyml">branches/6.0/.github/workflows/php-compatibility.yml</a></li>
<li><a href="#branches60githubworkflowsphpunittestsyml">branches/6.0/.github/workflows/phpunit-tests.yml</a></li>
<li><a href="#branches60githubworkflowstestcoverageyml">branches/6.0/.github/workflows/test-coverage.yml</a></li>
<li><a href="#branches60githubworkflowstestnpmyml">branches/6.0/.github/workflows/test-npm.yml</a></li>
<li><a href="#branches60githubworkflowswelcomenewcontributorsyml">branches/6.0/.github/workflows/welcome-new-contributors.yml</a></li>
<li><a href="#branches60dockercomposeyml">branches/6.0/docker-compose.yml</a></li>
<li><a href="#branches60toolslocalenvscriptsdockerjs">branches/6.0/tools/local-env/scripts/docker.js</a></li>
<li><a href="#branches60toolslocalenvscriptsinstalljs">branches/6.0/tools/local-env/scripts/install.js</a></li>
<li><a href="#branches60toolslocalenvscriptsstartjs">branches/6.0/tools/local-env/scripts/start.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches60env"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.env</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.env 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.env 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Defaults to 5.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# When using `mysql`, see https://hub.docker.com/_/mysql/ for valid versions.
-# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# When using `mysql`, see https://hub.docker.com/r/amd64/mysql for valid versions.
+# When using `mariadb`, see https://hub.docker.com/r/amd64/mariadb for valid versions.
</ins><span class="cx" style="display: block; padding: 0 10px"> ##
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_DB_VERSION=5.7
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches60githubworkflowscodingstandardsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/coding-standards.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/coding-standards.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/coding-standards.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Any change to a PHP or JavaScript file should run checks.
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.js'
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.php'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # These files configure NPM. Changes could affect the outcome.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # These files configure npm. Changes could affect the outcome.
</ins><span class="cx" style="display: block; padding: 0 10px"> - 'package*.json'
</span><span class="cx" style="display: block; padding: 0 10px"> # These files configure Composer. Changes could affect the outcome.
</span><span class="cx" style="display: block; padding: 0 10px"> - 'composer.*'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,13 +47,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets up PHP.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Logs debug information.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Configures caching for PHPCS scans.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs Composer dependencies (use cache if possible).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Composer dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Make Composer packages available globally.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Logs PHP_CodeSniffer debug information.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Runs PHPCS on the full codebase with warnings suppressed.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Generate a report for displaying issues as pull request annotations.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Runs PHPCS on the `tests` directory without warnings suppressed.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Generate a report for displaying `test` directory issues as pull request annotations.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,49 +63,55 @@
</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: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Set up PHP
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: shivammathur/setup-php@3eda58347216592f618bb1dff277810b6698e4ca # v2.19.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc # v2.23.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> php-version: '7.4'
</span><span class="cx" style="display: block; padding: 0 10px"> coverage: none
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tools: composer, cs2pr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tools: cs2pr
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Log debug information
- run: |
- php --version
- composer --version
-
</del><span class="cx" style="display: block; padding: 0 10px"> # This date is used to ensure that the PHPCS cache is cleared at least once every week.
</span><span class="cx" style="display: block; padding: 0 10px"> # http://man7.org/linux/man-pages/man1/date.1.html
</span><span class="cx" style="display: block; padding: 0 10px"> - name: "Get last Monday's date"
</span><span class="cx" style="display: block; padding: 0 10px"> id: get-date
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cache PHPCS scan cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # v3.0.4
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3.2.3
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: .cache/phpcs.json
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: |
+ .cache/phpcs-src.json
+ .cache/phpcs-tests.json
</ins><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # 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.
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Install Composer dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: ramsey/composer-install@f680dac46551dffb2234a240d65ae806c2999dd6 # v2.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- composer-options: "--no-progress --no-ansi --no-interaction"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ custom-cache-suffix: ${{ steps.get-date.outputs.date }}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Make Composer packages available globally
</span><span class="cx" style="display: block; padding: 0 10px"> run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Log PHPCS debug information
- run: phpcs -i
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Run PHPCS on all Core files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: phpcs -q -n --report=checkstyle | cs2pr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id: phpcs-core
+ run: phpcs -n --report-full --cache=./.cache/phpcs-src.json --report-checkstyle=./.cache/phpcs-report.xml
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Show PHPCS results in PR
+ if: ${{ always() && steps.phpcs-core.outcome == 'failure' }}
+ run: cs2pr ./.cache/phpcs-report.xml
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Check test suite files for warnings
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: phpcs tests -q --report=checkstyle | cs2pr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id: phpcs-tests
+ run: phpcs tests --report-full --cache=./.cache/phpcs-tests.json --report-checkstyle=./.cache/phpcs-tests-report.xml
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Show test suite scan results in PR
+ if: ${{ always() && steps.phpcs-tests.outcome == 'failure' }}
+ run: cs2pr ./.cache/phpcs-tests-report.xml
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified during the tests
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,10 +121,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Sets up Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # - Logs updated debug information.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Run the WordPress JSHint checks.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> jshint:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,17 +136,10 @@
</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: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Log debug information
- run: |
- npm --version
- node --version
- git --version
- svn --version
-
- - name: Install NodeJS
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Set up Node.js
+ uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span><span class="cx" style="display: block; padding: 0 10px"> cache: npm
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +148,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm --version
</span><span class="cx" style="display: block; padding: 0 10px"> node --version
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ git --version
+ svn --version
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install Dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install npm Dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm ci
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run JSHint
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,3 +172,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ phpcs, jshint, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.phpcs.result == 'cancelled' || needs.phpcs.result == 'failure' ||
+ needs.jshint.result == 'cancelled' || needs.jshint.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ 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="branches60githubworkflowsendtoendtestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.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.0/.github/workflows/end-to-end-tests.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/end-to-end-tests.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,12 +33,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets environment variables.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Sets up Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Builds WordPress to run from the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Starts the WordPress Docker container.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Logs general debug information.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Logs the running Docker containers.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs Docker debug information (about both the Docker installation within the runner and the WordPress container).
</span><span class="cx" style="display: block; padding: 0 10px"> # - Install WordPress within the Docker container.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +56,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Set up Node.js
+ uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+ with:
+ node-version-file: '.nvmrc'
+ cache: npm
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm --version
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,17 +71,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> curl --version
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- php --version
- php -i
</del><span class="cx" style="display: block; padding: 0 10px"> locale -a
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0
- with:
- node-version-file: '.nvmrc'
- cache: npm
-
- - name: Install Dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install npm Dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm ci
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Build WordPress
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,14 +83,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm run env:start
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: General debug information
- run: |
- npm --version
- node --version
- curl --version
- git --version
- svn --version
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Log running Docker containers
</span><span class="cx" style="display: block; padding: 0 10px"> run: docker ps -a
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,3 +117,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ e2e-tests, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.e2e-tests.result == 'cancelled' || needs.e2e-tests.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ 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="branches60githubworkflowsjavascripttestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/javascript-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/javascript-tests.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/javascript-tests.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> paths:
</span><span class="cx" style="display: block; padding: 0 10px"> # Any change to a JavaScript file should run tests.
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.js'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # These files configure NPM. Changes could affect the outcome.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # These files configure npm. Changes could affect the outcome.
</ins><span class="cx" style="display: block; padding: 0 10px"> - 'package*.json'
</span><span class="cx" style="display: block; padding: 0 10px"> # This file configures ESLint. Changes could affect the outcome.
</span><span class="cx" style="display: block; padding: 0 10px"> - '.eslintignore'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,10 +42,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Sets up Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # - Logs updated debug information.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Run the WordPress QUnit tests.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> test-js:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,17 +55,10 @@
</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: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Log debug information
- run: |
- npm --version
- node --version
- git --version
- svn --version
-
- - name: Install NodeJS
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Set up Node.js
+ uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span><span class="cx" style="display: block; padding: 0 10px"> cache: npm
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,8 +67,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm --version
</span><span class="cx" style="display: block; padding: 0 10px"> node --version
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ git --version
+ svn --version
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install Dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install npm Dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm ci
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run QUnit tests
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,3 +91,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ test-js, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.test-js.result == 'cancelled' || needs.test-js.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ 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="branches60githubworkflowsphpcompatibilityyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/php-compatibility.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/php-compatibility.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/php-compatibility.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,10 +44,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets up PHP.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Configures caching for PHP compatibility scans.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs Composer dependencies (use cache if possible).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Composer dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Make Composer packages available globally.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Logs PHP_CodeSniffer debug information.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Runs the PHP compatibility tests.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Generate a report for displaying issues as pull request annotations.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,18 +57,17 @@
</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: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Set up PHP
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: shivammathur/setup-php@3eda58347216592f618bb1dff277810b6698e4ca # v2.19.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc # v2.23.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> php-version: '7.4'
</span><span class="cx" style="display: block; padding: 0 10px"> coverage: none
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tools: composer, cs2pr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tools: cs2pr
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- php --version
</del><span class="cx" style="display: block; padding: 0 10px"> composer --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # This date is used to ensure that the PHP compatibility cache is cleared at least once every week.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,28 +74,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # http://man7.org/linux/man-pages/man1/date.1.html
</span><span class="cx" style="display: block; padding: 0 10px"> - name: "Get last Monday's date"
</span><span class="cx" style="display: block; padding: 0 10px"> id: get-date
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cache PHP compatibility scan cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # v3.0.4
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3.2.3
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> path: .cache/phpcompat.json
</span><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # 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.
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Install Composer dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: ramsey/composer-install@f680dac46551dffb2234a240d65ae806c2999dd6 # v2.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- composer-options: "--no-progress --no-ansi --no-interaction"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ custom-cache-suffix: ${{ steps.get-date.outputs.date }}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Make Composer packages available globally
</span><span class="cx" style="display: block; padding: 0 10px"> run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Log PHPCS debug information
- run: phpcs -i
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Run PHP compatibility tests
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: phpcs --standard=phpcompat.xml.dist -q --report=checkstyle | cs2pr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id: phpcs
+ run: phpcs --standard=phpcompat.xml.dist --report-full --report-checkstyle=./.cache/phpcs-compat-report.xml
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Show PHPCompatibility results in PR
+ if: ${{ always() && steps.phpcs.outcome == 'failure' }}
+ run: cs2pr ./.cache/phpcs-compat-report.xml
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified or deleted
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,3 +115,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ php-compatibility, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.php-compatibility.result == 'cancelled' || needs.php-compatibility.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ 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="branches60githubworkflowsphpunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/phpunit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/phpunit-tests.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/phpunit-tests.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,23 +39,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets environment variables.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Sets up the environment variables needed for testing with memcached (if desired).
- # - Installs NodeJS.
- # - Installs NPM dependencies
- # - Configures caching for Composer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Checks out the repository.
+ # - Sets up Node.js.
+ # - Sets up PHP.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Installs Composer dependencies.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs npm dependencies
+ # - Logs general debug information about the runner.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs Docker debug information (about the Docker installation within the runner).
</span><span class="cx" style="display: block; padding: 0 10px"> # - Starts the WordPress Docker container.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Starts the Memcached server after the Docker network has been created (if desired).
- # - Logs general debug information about the runner.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Logs the running Docker containers.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Logs debug information from inside the WordPress Docker container.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about what's installed within the WordPress Docker containers.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Install WordPress within the Docker container.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Run the PHPUnit tests.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the WordPress Test reporter repository.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Reconnect the directory to the Git repository.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Submit the test results to the WordPress.org host test results.
</span><span class="cx" style="display: block; padding: 0 10px"> test-php:
</span><span class="cx" style="display: block; padding: 0 10px"> name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,46 +107,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Set up Node.js
+ uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span><span class="cx" style="display: block; padding: 0 10px"> cache: npm
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install Dependencies
- run: npm ci
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ##
+ # 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@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc # v2.23.0
+ with:
+ php-version: '${{ matrix.php }}'
+ coverage: none
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # This date is used to ensure that the Composer cache is refreshed 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 "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # 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")
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Get Composer cache directory
- id: composer-cache
- run: echo "::set-output name=dir::$(composer config cache-files-dir)"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install npm dependencies
+ run: npm ci
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Cache Composer dependencies
- uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # v3.0.4
- env:
- cache-name: cache-composer-dependencies
- with:
- path: ${{ steps.composer-cache.outputs.dir }}
- key: ${{ runner.os }}-php-${{ matrix.php }}-date-${{ steps.get-date.outputs.date }}-composer-${{ hashFiles('**/composer.json') }}
-
- - name: Install Composer dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: General debug information
</ins><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- docker-compose run --rm php composer --version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ npm --version
+ node --version
+ curl --version
+ git --version
+ svn --version
+ composer --version
+ locale -a
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Install using `composer update` as there is no `composer.lock` file.
- if [ ${{ env.LOCAL_PHP }} == '8.1-fpm' ]; then
- docker-compose run --rm php composer update --ignore-platform-reqs
- else
- docker-compose run --rm php composer update
- fi
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Docker debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> docker -v
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,21 +157,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm run env:start
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # The memcached server needs to start after the Docker network has been set up with `npm run env:start`.
- - name: Start the Memcached server.
- if: ${{ matrix.memcached }}
- run: |
- cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
- docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
-
- - name: General debug information
- run: |
- npm --version
- node --version
- curl --version
- git --version
- svn --version
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Log running Docker containers
</span><span class="cx" style="display: block; padding: 0 10px"> run: docker ps -a
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout the WordPress Test Reporter
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> repository: 'WordPress/phpunit-test-runner'
</span><span class="cx" style="display: block; padding: 0 10px"> path: 'test-runner'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,3 +237,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ test-php, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ 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="branches60githubworkflowstestcoverageyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/test-coverage.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/test-coverage.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/test-coverage.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,11 +89,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # http://man7.org/linux/man-pages/man1/date.1.html
</span><span class="cx" style="display: block; padding: 0 10px"> - name: "Get last Monday's date"
</span><span class="cx" style="display: block; padding: 0 10px"> id: get-date
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Get Composer cache directory
</span><span class="cx" style="display: block; padding: 0 10px"> id: composer-cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: echo "::set-output name=dir::$(composer config cache-files-dir)"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cache Composer dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> uses: actions/cache@136d96b4aee02b1f0de3ba493b1d47135042d9c0 # v3.0.1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> cache-name: cache-composer-dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: ${{ steps.composer-cache.outputs.dir }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: ${{ steps.composer-cache.outputs.composer_dir }}
</ins><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-php-${{ matrix.php }}-date-${{ steps.get-date.outputs.date }}-composer-${{ hashFiles('**/composer.json') }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Composer dependencies
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,3 +181,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ test-coverage-report, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.test-coverage-report.result == 'cancelled' || needs.test-coverage-report.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@d4560e157075e2d93aa3022b5b51a42a880f1f93 # v6.3.0
+ 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="branches60githubworkflowstestnpmyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/test-npm.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/test-npm.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/test-npm.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-name: Test NPM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+name: Test npm
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,11 +15,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '3.[7-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> paths:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # These files configure NPM. Changes could affect the outcome.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # These files configure npm. Changes could affect the outcome.
</ins><span class="cx" style="display: block; padding: 0 10px"> - 'package*.json'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # JavaScript files are built using NPM.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # JavaScript files are built using npm.
</ins><span class="cx" style="display: block; padding: 0 10px"> - '**.js'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # CSS and SCSS files are built using NPM.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # CSS and SCSS files are built using npm.
</ins><span class="cx" style="display: block; padding: 0 10px"> - '**.scss'
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.css'
</span><span class="cx" style="display: block; padding: 0 10px"> # Changes to workflow files should always verify all workflows are successful.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,13 +37,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
</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">- # Verifies that installing NPM dependencies and building WordPress works as expected.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Verifies that installing npm dependencies and building WordPress works as expected.
</ins><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Sets up Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Builds WordPress to run from the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `src` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> test-npm:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name: Test NPM on ${{ matrix.os }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name: Test npm on ${{ matrix.os }}
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: ${{ matrix.os }}
</span><span class="cx" style="display: block; padding: 0 10px"> timeout-minutes: 20
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,8 +62,14 @@
</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: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Set up Node.js
+ uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+ with:
+ node-version-file: '.nvmrc'
+ cache: npm
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm --version
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,43 +78,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0
- with:
- node-version-file: '.nvmrc'
- cache: npm
-
- - name: Install Dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install npm Dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm ci
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Build WordPress
- run: npm run build
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Build WordPress in /src
+ run: npm run build:dev
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Clean after building
- run: npm run grunt clean
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Clean after building in /src
+ run: npm run grunt clean -- --dev
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified or deleted during building and cleaning
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Build WordPress in /src
- run: npm run build:dev
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Build WordPress
+ run: npm run build
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Clean after building in /src
- run: npm run grunt clean -- --dev
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Clean after building
+ run: npm run grunt clean
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified or deleted during building and cleaning
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Verifies that installing NPM dependencies and building WordPress works as expected on MacOS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Verifies that installing npm dependencies and building WordPress works as expected on MacOS.
</ins><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # This is separate from the job above in order to use stricter conditions about when to run.
</span><span class="cx" style="display: block; padding: 0 10px"> # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate.
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # 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.
+ #
</ins><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Sets up Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Builds WordPress to run from the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,14 +120,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `src` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> test-npm-macos:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name: Test NPM on MacOS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name: Test npm on MacOS
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: macos-latest
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- timeout-minutes: 20
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ timeout-minutes: 30
</ins><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' }}
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Set up Node.js
+ uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+ with:
+ node-version-file: '.nvmrc'
+ cache: npm
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="cx" style="display: block; padding: 0 10px"> npm --version
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,29 +142,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0
- with:
- node-version-file: '.nvmrc'
- cache: npm
-
- - name: Install Dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install npm Dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm ci
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Build WordPress
- run: npm run build
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Build WordPress in /src
+ run: npm run build:dev
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Clean after building
- run: npm run grunt clean
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Clean after building in /src
+ run: npm run grunt clean -- --dev
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified or deleted during building and cleaning
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Build WordPress in /src
- run: npm run build:dev
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Build WordPress
+ run: npm run build
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Clean after building in /src
- run: npm run grunt clean -- --dev
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Clean after building
+ run: npm run grunt clean
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified or deleted during building and cleaning
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,3 +175,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
</span><span class="cx" style="display: block; padding: 0 10px"> SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ failed-workflow:
+ name: Failed workflow tasks
+ runs-on: ubuntu-latest
+ needs: [ test-npm, test-npm-macos, slack-notifications ]
+ if: |
+ always() &&
+ github.repository == 'WordPress/wordpress-develop' &&
+ github.event_name != 'pull_request' &&
+ github.run_attempt < 2 &&
+ (
+ needs.test-npm.result == 'cancelled' || needs.test-npm.result == 'failure' ||
+ needs.test-npm-macos.result == 'cancelled' || needs.test-npm-macos.result == 'failure'
+ )
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ 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="branches60githubworkflowswelcomenewcontributorsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/.github/workflows/welcome-new-contributors.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/.github/workflows/welcome-new-contributors.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/.github/workflows/welcome-new-contributors.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - uses: bubkoo/welcome-action@8dbbac2540d155744c90e4e37da6b05ffc9c5e2c # v1.0.3
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - uses: bubkoo/welcome-action@e3f444df06502502071d309411d01ba18f916ede # v1.0.3
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
</span><span class="cx" style="display: block; padding: 0 10px"> FIRST_PR_COMMENT: >
</span></span></pre></div>
<a id="branches60dockercomposeyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/docker-compose.yml 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/docker-compose.yml 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,14 +48,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
</span><span class="cx" style="display: block; padding: 0 10px"> - ./:/var/www
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Copy or delete the Memcached dropin plugin file as appropriate.
+ command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm"
+
</ins><span class="cx" style="display: block; padding: 0 10px"> depends_on:
</span><span class="cx" style="display: block; padding: 0 10px"> - mysql
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
+ init: true
+
+ extra_hosts:
+ - localhost:host-gateway
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ##
</span><span class="cx" style="display: block; padding: 0 10px"> # The MySQL container.
</span><span class="cx" style="display: block; padding: 0 10px"> ##
</span><span class="cx" style="display: block; padding: 0 10px"> mysql:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> networks:
</span><span class="cx" style="display: block; padding: 0 10px"> - wpdevnet
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +103,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
</span><span class="cx" style="display: block; padding: 0 10px"> init: true
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ extra_hosts:
+ - localhost:host-gateway
+
+ ##
+ # The Memcached container.
+ ##
+ memcached:
+ image: memcached
+
+ networks:
+ - wpdevnet
+
+ ports:
+ - 11211:11211
+
</ins><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><span class="cx" style="display: block; padding: 0 10px"> # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.
</span><span class="cx" style="display: block; padding: 0 10px"> mysql: {}
</span></span></pre></div>
<a id="branches60toolslocalenvscriptsdockerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tools/local-env/scripts/docker.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tools/local-env/scripts/docker.js 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/tools/local-env/scripts/docker.js 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,9 +4,5 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( process.arch === 'arm64' ) {
- process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Execute any docker-compose command passed to this script.
</span><span class="cx" style="display: block; padding: 0 10px"> execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
</span></span></pre></div>
<a id="branches60toolslocalenvscriptsinstalljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tools/local-env/scripts/install.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tools/local-env/scripts/install.js 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/tools/local-env/scripts/install.js 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,10 +6,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( process.arch === 'arm64' ) {
- process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Create wp-config.php.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cli( 'config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --path=/var/www/src --force' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches60toolslocalenvscriptsstartjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tools/local-env/scripts/start.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tools/local-env/scripts/start.js 2023-03-07 17:42:27 UTC (rev 55481)
+++ branches/6.0/tools/local-env/scripts/start.js 2023-03-07 19:36:29 UTC (rev 55482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,12 +4,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( process.arch === 'arm64' ) {
- process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Start the local-env containers.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-execSync( 'docker-compose up -d wordpress-develop', { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
+ ? 'wordpress-develop memcached'
+ : 'wordpress-develop';
+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>