<!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>[55357] branches/6.1/.github/workflows: 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/55357">55357</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/55357","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-02-17 07:51:16 +0000 (Fri, 17 Feb 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 updates to GitHub Actions workflows required to address deprecated notices related to `save-output` and `set-output`.
Merges <a href="https://core.trac.wordpress.org/changeset/54650">[54650]</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>, and <a href="https://core.trac.wordpress.org/changeset/55152">[55152]</a> to the 6.1 branch.
See <a href="https://core.trac.wordpress.org/ticket/56882">#56882</a>, <a href="https://core.trac.wordpress.org/ticket/56820">#56820</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61githubworkflowscodingstandardsyml">branches/6.1/.github/workflows/coding-standards.yml</a></li>
<li><a href="#branches61githubworkflowsendtoendtestsyml">branches/6.1/.github/workflows/end-to-end-tests.yml</a></li>
<li><a href="#branches61githubworkflowsfailedworkflowyml">branches/6.1/.github/workflows/failed-workflow.yml</a></li>
<li><a href="#branches61githubworkflowsjavascripttestsyml">branches/6.1/.github/workflows/javascript-tests.yml</a></li>
<li><a href="#branches61githubworkflowsphpcompatibilityyml">branches/6.1/.github/workflows/php-compatibility.yml</a></li>
<li><a href="#branches61githubworkflowsphpunittestsyml">branches/6.1/.github/workflows/phpunit-tests.yml</a></li>
<li><a href="#branches61githubworkflowsslacknotificationsyml">branches/6.1/.github/workflows/slack-notifications.yml</a></li>
<li><a href="#branches61githubworkflowstestcoverageyml">branches/6.1/.github/workflows/test-coverage.yml</a></li>
<li><a href="#branches61githubworkflowstestnpmyml">branches/6.1/.github/workflows/test-npm.yml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches61githubworkflowscodingstandardsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/coding-standards.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/coding-standards.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/coding-standards.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,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">@@ -48,13 +48,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">@@ -64,20 +64,15 @@
</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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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@e04e1d97f0c0481c6e1ba40f8a538454fe5d7709 # v2.21.2
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,22 +80,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
</span><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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
</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/phpcs.json
</span><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"
</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><span class="cx" style="display: block; padding: 0 10px"> id: phpcs-core
</span><span class="cx" style="display: block; padding: 0 10px"> run: phpcs -n --report-full --report-checkstyle=./.cache/phpcs-report.xml
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,10 +120,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">@@ -142,17 +135,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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</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">@@ -161,8 +147,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">@@ -200,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowsendtoendtestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.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.1/.github/workflows/end-to-end-tests.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/end-to-end-tests.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,12 +35,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">@@ -59,8 +58,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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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">@@ -68,17 +73,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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
- 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">@@ -88,14 +85,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">@@ -146,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowsfailedworkflowyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/failed-workflow.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/failed-workflow.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/failed-workflow.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Rerun a workflow
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowsjavascripttestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/javascript-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/javascript-tests.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/javascript-tests.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 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">@@ -43,10 +43,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">@@ -57,17 +56,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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</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">@@ -76,8 +68,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">@@ -114,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowsphpcompatibilityyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/php-compatibility.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/php-compatibility.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/php-compatibility.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,10 +46,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">@@ -59,18 +59,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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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@e04e1d97f0c0481c6e1ba40f8a538454fe5d7709 # v2.21.2
</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">@@ -80,22 +79,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
</span><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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
</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"
</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><span class="cx" style="display: block; padding: 0 10px"> id: phpcs
</span><span class="cx" style="display: block; padding: 0 10px"> run: phpcs --standard=phpcompat.xml.dist --report-full --report-checkstyle=./.cache/phpcs-compat-report.xml
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowsphpunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/phpunit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/phpunit-tests.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/phpunit-tests.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,22 +36,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">- # - 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">@@ -106,46 +104,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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</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 "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
</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 "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
</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@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
- env:
- cache-name: cache-composer-dependencies
- with:
- path: ${{ steps.composer-cache.outputs.composer_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.2-fpm' ]; then
- docker-compose run --rm php composer update --ignore-platform-req=php+
- 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">@@ -155,14 +154,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">@@ -216,7 +207,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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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">@@ -255,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowsslacknotificationsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/slack-notifications.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/slack-notifications.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/slack-notifications.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Determine the status of the previous attempt
</span><span class="cx" style="display: block; padding: 0 10px"> id: previous-attempt-result
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Get the commit message
</span><span class="cx" style="display: block; padding: 0 10px"> id: current-commit-message
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span></span></pre></div>
<a id="branches61githubworkflowstestcoverageyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/test-coverage.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/test-coverage.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/test-coverage.yml 2023-02-17 07:51:16 UTC (rev 55357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,26 +32,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_PHP_MEMCACHED: ${{ false }}
</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">- # Sets up WordPress for testing or development use.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Runs the PHPUnit tests for WordPress.
</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"> # - Sets environment variables.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Checks out the WordPress Importer plugin (needed for the Core PHPUnit tests).
- # - Logs debug information about the GitHub Action runner.
- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Sets up Node.js.
+ # - Sets up PHP.
+ # - Installs Composer dependencies.
+ # - 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">- # - Logs debug general information.
</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 WordPress Docker container debug information.
</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 as a single site.
</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"> # - Upload the single site code coverage report to Codecov.io.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Run the PHPUnit tests as a multisite.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Run the PHPUnit tests as a multisite installation.
</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"> # - Upload the multisite code coverage report to Codecov.io.
</span><span class="cx" style="display: block; padding: 0 10px"> test-coverage-report:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,8 +70,37 @@
</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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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
+
+ ##
+ # 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: '7.4'
+ coverage: none
+
+ # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
+ # passing a custom cache suffix ensures that the cache is flushed at least once per week.
+ - name: Install Composer dependencies
+ uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
+ with:
+ custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")
+
+ - name: Install npm Dependencies
+ run: npm ci
+
</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"> echo "$GITHUB_REF"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,44 +110,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ composer --version
</ins><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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
- with:
- node-version-file: '.nvmrc'
- cache: npm
-
- - name: Install Dependencies
- run: npm ci
-
- # 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 "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
-
- - name: Get Composer cache directory
- id: composer-cache
- run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
- - name: Cache Composer dependencies
- uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
- env:
- cache-name: cache-composer-dependencies
- with:
- path: ${{ steps.composer-cache.outputs.composer_dir }}
- key: ${{ runner.os }}-php-${{ matrix.php }}-date-${{ steps.get-date.outputs.date }}-composer-${{ hashFiles('**/composer.json') }}
-
- - name: Install Composer dependencies
- run: |
- docker-compose run --rm php composer --version
-
- # Install using `composer update` as there is no `composer.lock` file.
- docker-compose run --rm php composer update
-
</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">@@ -129,14 +122,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">@@ -209,7 +194,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre></div>
<a id="branches61githubworkflowstestnpmyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/.github/workflows/test-npm.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/.github/workflows/test-npm.yml 2023-02-16 23:09:54 UTC (rev 55356)
+++ branches/6.1/.github/workflows/test-npm.yml 2023-02-17 07:51:16 UTC (rev 55357)
</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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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,13 +78,7 @@
</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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
- 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 in /src
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,16 +99,20 @@
</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><span class="cx" style="display: block; padding: 0 10px"> timeout-minutes: 30
</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"> 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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</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,13 +142,7 @@
</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@8c91899e586c5b171469028077307d293428b516 # v3.5.1
- 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 in /src
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Dispatch workflow run
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> retries: 2
</span><span class="cx" style="display: block; padding: 0 10px"> retry-exempt-status-codes: 418
</span></span></pre>
</div>
</div>
</body>
</html>