<!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>[50601] branches/5.7: Build/Test Tools: Backport several build tool fixes & improvements.</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/50601">50601</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/50601","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>2021-03-26 16:07:38 +0000 (Fri, 26 Mar 2021)</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 several build tool fixes & improvements.
This backports a handful of test fixes related to generating code coverage reporting, as well as some `devDependency` updates.
Backports [50591-50595,50597-50598] to the 5.7 branch.
See <a href="https://core.trac.wordpress.org/ticket/52624">#52624</a>, <a href="https://core.trac.wordpress.org/ticket/52786">#52786</a>, <a href="https://core.trac.wordpress.org/ticket/51734">#51734</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches57githubworkflowstestcoverageyml">branches/5.7/.github/workflows/test-coverage.yml</a></li>
<li><a href="#branches57packagelockjson">branches/5.7/package-lock.json</a></li>
<li><a href="#branches57packagejson">branches/5.7/package.json</a></li>
<li><a href="#branches57phpunitxmldist">branches/5.7/phpunit.xml.dist</a></li>
<li><a href="#branches57testsphpunitmultisitexml">branches/5.7/tests/phpunit/multisite.xml</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches57">branches/5.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.7 2021-03-26 15:54:07 UTC (rev 50600)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.7 2021-03-26 16:07:38 UTC (rev 50601)
</ins><a id="branches57"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:50428-50430,50432,50435-50436,50439,50441-50445,50460-50461,50465-50466,50471,50475,50478-50479,50483,50485-50487,50493,50495,50499,50501,50507,50510,50518,50523,50525,50534-50535,50545,50551-50552,50566-50569,50571,50577,50579,50590,50596
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:50428-50430,50432,50435-50436,50439,50441-50445,50460-50461,50465-50466,50471,50475,50478-50479,50483,50485-50487,50493,50495,50499,50501,50507,50510,50518,50523,50525,50534-50535,50545,50551-50552,50566-50569,50571,50577,50579,50590-50598
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches57githubworkflowstestcoverageyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/.github/workflows/test-coverage.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/.github/workflows/test-coverage.yml 2021-03-26 15:54:07 UTC (rev 50600)
+++ branches/5.7/.github/workflows/test-coverage.yml 2021-03-26 16:07:38 UTC (rev 50601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name: Code Coverage Report
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Verify
+ push:
+ branches:
+ - master
+ - trunk
+ paths:
+ - '.github/workflows/test-coverage.yml'
+ - 'phpunit.xml.dist'
+ - 'tests/phpunit/multisite.xml'
</ins><span class="cx" style="display: block; padding: 0 10px"> # Once daily at 00:00 UTC.
</span><span class="cx" style="display: block; padding: 0 10px"> schedule:
</span><span class="cx" style="display: block; padding: 0 10px"> - cron: '0 0 * * *'
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Allow manually triggering the workflow.
+ workflow_dispatch:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,9 +48,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Run the PHPUnit tests as a multisite.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name: Generate a code coverage report
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: ubuntu-latest
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ strategy:
+ fail-fast: false
+ matrix:
+ multisite: [ false, true ]
</ins><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: Configure environment variables
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,9 +65,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><span class="cx" style="display: block; padding: 0 10px"> uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Checkout the WordPress Importer plugin
- run: svn checkout -r 2387243 https://plugins.svn.wordpress.org/wordpress-importer/trunk/ tests/phpunit/data/plugins/wordpress-importer
-
</del><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">@@ -115,9 +127,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run env:install
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run tests as a single site
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ ! matrix.multisite }}
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --coverage-clover wp-code-coverage-single-clover-${{ github.sha }}.xml
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Upload single site report to Codecov
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ ! matrix.multisite }}
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> file: wp-code-coverage-single-clover-${{ github.sha }}.xml
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,9 +138,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> flags: single,php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run tests as a multisite install
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ matrix.multisite }}
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --coverage-clover wp-code-coverage-multisite-clover-${{ github.sha }}.xml
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Upload multisite report to Codecov
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ matrix.multisite }}
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> file: wp-code-coverage-multisite-clover-${{ github.sha }}.xml
</span></span></pre></div>
<a id="branches57packagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/package-lock.json 2021-03-26 15:54:07 UTC (rev 50600)
+++ branches/5.7/package-lock.json 2021-03-26 16:07:38 UTC (rev 50601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3930,14 +3930,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "tar-fs": "^2.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "unbzip2-stream": "^1.3.3",
</span><span class="cx" style="display: block; padding: 0 10px"> "ws": "^7.2.3"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
- "dependencies": {
- "devtools-protocol": {
- "version": "0.0.818844",
- "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
- "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
- "dev": true
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "rimraf": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8065,6 +8057,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": 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">+ "devtools-protocol": {
+ "version": "0.0.818844",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+ "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
+ "dev": true
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "diff": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "4.0.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16345,9 +16343,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "nise": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz",
- "integrity": "sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz",
+ "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "@sinonjs/commons": "^1.7.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20530,9 +20528,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "sinon": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "9.2.4",
- "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
- "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/sinon/-/sinon-10.0.0.tgz",
+ "integrity": "sha512-XAn5DxtGVJBlBWYrcYKEhWCz7FLwZGdyvANRyK06419hyEpdT0dMc5A8Vcxg5SCGHc40CsqoKsc1bt1CbJPfNw==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "@sinonjs/commons": "^1.8.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20539,7 +20537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "@sinonjs/fake-timers": "^6.0.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "@sinonjs/samsam": "^5.3.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "diff": "^4.0.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "nise": "^4.0.4",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "nise": "^4.1.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "supports-color": "^7.1.0"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "dependencies": {
</span></span></pre></div>
<a id="branches57packagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/package.json 2021-03-26 15:54:07 UTC (rev 50600)
+++ branches/5.7/package.json 2021-03-26 16:07:38 UTC (rev 50601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,10 +66,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "puppeteer": "npm:puppeteer-core@3.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "qunit": "~2.14.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "sass": "^1.32.8",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "sinon": "~9.2.4",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "sinon": "~10.0.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "sinon-test": "~3.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "source-map-loader": "^1.1.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "uglify-js": "^3.13.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "uglify-js": "^3.13.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> "uglifyjs-webpack-plugin": "2.2.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "uuid": "8.3.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "wait-on": "5.3.0",
</span></span></pre></div>
<a id="branches57phpunitxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/phpunit.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/phpunit.xml.dist 2021-03-26 15:54:07 UTC (rev 50600)
+++ branches/5.7/phpunit.xml.dist 2021-03-26 16:07:38 UTC (rev 50601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,38 +42,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </listeners>
</span><span class="cx" style="display: block; padding: 0 10px"> <filter>
</span><span class="cx" style="display: block; padding: 0 10px"> <whitelist addUncoveredFilesFromWhitelist="true">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">build</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">src</directory>
</ins><span class="cx" style="display: block; padding: 0 10px"> <exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Third party library exclusions. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">build/wp-includes/ID3</directory>
- <directory suffix=".php">build/wp-includes/IXR</directory>
- <directory suffix=".php">build/wp-includes/random_compat</directory>
- <directory suffix=".php">build/wp-includes/PHPMailer</directory>
- <directory suffix=".php">build/wp-includes/Requests</directory>
- <directory suffix=".php">build/wp-includes/SimplePie</directory>
- <directory suffix=".php">build/wp-includes/sodium_compat</directory>
- <directory suffix=".php">build/wp-includes/Text</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">src/wp-includes/ID3</directory>
+ <directory suffix=".php">src/wp-includes/IXR</directory>
+ <directory suffix=".php">src/wp-includes/random_compat</directory>
+ <directory suffix=".php">src/wp-includes/PHPMailer</directory>
+ <directory suffix=".php">src/wp-includes/Requests</directory>
+ <directory suffix=".php">src/wp-includes/SimplePie</directory>
+ <directory suffix=".php">src/wp-includes/sodium_compat</directory>
+ <directory suffix=".php">src/wp-includes/Text</directory>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Plugins and themes. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">build/wp-content/</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">src/wp-content/</directory>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <file>build/wp-admin/includes/class-ftp*</file>
- <file>build/wp-admin/includes/class-pclzip.php</file>
- <file>build/wp-admin/includes/deprecated.php</file>
- <file>build/wp-admin/includes/ms-deprecated.php</file>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <file>src/wp-admin/includes/class-ftp*</file>
+ <file>src/wp-admin/includes/class-pclzip.php</file>
+ <file>src/wp-admin/includes/deprecated.php</file>
+ <file>src/wp-admin/includes/ms-deprecated.php</file>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <file>build/wp-includes/atomlib.php</file>
- <file>build/wp-includes/class-IXR.php</file>
- <file>build/wp-includes/class-json.php</file>
- <file>build/wp-includes/class-phpass.php</file>
- <file>build/wp-includes/class-pop3.php</file>
- <file>build/wp-includes/class-requests.php</file>
- <file>build/wp-includes/class-simplepie.php</file>
- <file>build/wp-includes/class-snoopy.php</file>
- <file>build/wp-includes/deprecated.php</file>
- <file>build/wp-includes/ms-deprecated.php</file>
- <file>build/wp-includes/pluggable-deprecated.php</file>
- <file>build/wp-includes/rss.php</file>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <file>src/wp-includes/atomlib.php</file>
+ <file>src/wp-includes/class-IXR.php</file>
+ <file>src/wp-includes/class-json.php</file>
+ <file>src/wp-includes/class-phpass.php</file>
+ <file>src/wp-includes/class-pop3.php</file>
+ <file>src/wp-includes/class-requests.php</file>
+ <file>src/wp-includes/class-simplepie.php</file>
+ <file>src/wp-includes/class-snoopy.php</file>
+ <file>src/wp-includes/deprecated.php</file>
+ <file>src/wp-includes/ms-deprecated.php</file>
+ <file>src/wp-includes/pluggable-deprecated.php</file>
+ <file>src/wp-includes/rss.php</file>
</ins><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> </whitelist>
</span><span class="cx" style="display: block; padding: 0 10px"> </filter>
</span></span></pre></div>
<a id="branches57testsphpunitmultisitexml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/tests/phpunit/multisite.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/tests/phpunit/multisite.xml 2021-03-26 15:54:07 UTC (rev 50600)
+++ branches/5.7/tests/phpunit/multisite.xml 2021-03-26 16:07:38 UTC (rev 50601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,38 +41,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </listeners>
</span><span class="cx" style="display: block; padding: 0 10px"> <filter>
</span><span class="cx" style="display: block; padding: 0 10px"> <whitelist addUncoveredFilesFromWhitelist="true">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">../../build</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">../../src</directory>
</ins><span class="cx" style="display: block; padding: 0 10px"> <exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Third party library exclusions. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">../../build/wp-includes/ID3</directory>
- <directory suffix=".php">../../build/wp-includes/IXR</directory>
- <directory suffix=".php">../../build/wp-includes/random_compat</directory>
- <directory suffix=".php">../../build/wp-includes/PHPMailer</directory>
- <directory suffix=".php">../../build/wp-includes/Requests</directory>
- <directory suffix=".php">../../build/wp-includes/SimplePie</directory>
- <directory suffix=".php">../../build/wp-includes/sodium_compat</directory>
- <directory suffix=".php">../../build/wp-includes/Text</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">../../src/wp-includes/ID3</directory>
+ <directory suffix=".php">../../src/wp-includes/IXR</directory>
+ <directory suffix=".php">../../src/wp-includes/random_compat</directory>
+ <directory suffix=".php">../../src/wp-includes/PHPMailer</directory>
+ <directory suffix=".php">../../src/wp-includes/Requests</directory>
+ <directory suffix=".php">../../src/wp-includes/SimplePie</directory>
+ <directory suffix=".php">../../src/wp-includes/sodium_compat</directory>
+ <directory suffix=".php">../../src/wp-includes/Text</directory>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Plugins and themes. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">../../build/wp-content/</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">../../src/wp-content/</directory>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <file>../../build/wp-admin/includes/class-ftp*</file>
- <file>../../build/wp-admin/includes/class-pclzip.php</file>
- <file>../../build/wp-admin/includes/deprecated.php</file>
- <file>../../build/wp-admin/includes/ms-deprecated.php</file>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <file>../../src/wp-admin/includes/class-ftp*</file>
+ <file>../../src/wp-admin/includes/class-pclzip.php</file>
+ <file>../../src/wp-admin/includes/deprecated.php</file>
+ <file>../../src/wp-admin/includes/ms-deprecated.php</file>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <file>../../build/wp-includes/atomlib.php</file>
- <file>../../build/wp-includes/class-IXR.php</file>
- <file>../../build/wp-includes/class-json.php</file>
- <file>../../build/wp-includes/class-phpass.php</file>
- <file>../../build/wp-includes/class-pop3.php</file>
- <file>../../build/wp-includes/class-requests.php</file>
- <file>../../build/wp-includes/class-simplepie.php</file>
- <file>../../build/wp-includes/class-snoopy.php</file>
- <file>../../build/wp-includes/deprecated.php</file>
- <file>../../build/wp-includes/ms-deprecated.php</file>
- <file>../../build/wp-includes/pluggable-deprecated.php</file>
- <file>../../build/wp-includes/rss.php</file>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <file>../../src/wp-includes/atomlib.php</file>
+ <file>../../src/wp-includes/class-IXR.php</file>
+ <file>../../src/wp-includes/class-json.php</file>
+ <file>../../src/wp-includes/class-phpass.php</file>
+ <file>../../src/wp-includes/class-pop3.php</file>
+ <file>../../src/wp-includes/class-requests.php</file>
+ <file>../../src/wp-includes/class-simplepie.php</file>
+ <file>../../src/wp-includes/class-snoopy.php</file>
+ <file>../../src/wp-includes/deprecated.php</file>
+ <file>../../src/wp-includes/ms-deprecated.php</file>
+ <file>../../src/wp-includes/pluggable-deprecated.php</file>
+ <file>../../src/wp-includes/rss.php</file>
</ins><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> </whitelist>
</span><span class="cx" style="display: block; padding: 0 10px"> </filter>
</span></span></pre>
</div>
</div>
</body>
</html>