<!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>[56440] trunk/.github/workflows: Build/Test Tools: Merge pre-commit changes missed in [56439].</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/56440">56440</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/56440","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-08-24 13:28:26 +0000 (Thu, 24 Aug 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: Merge pre-commit changes missed in <a href="https://core.trac.wordpress.org/changeset/56439">[56439]</a>.
Props l1nuxjedi.
See <a href="https://core.trac.wordpress.org/ticket/30462">#30462</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgithubworkflowsphpunittestsrunyml">trunk/.github/workflows/phpunit-tests-run.yml</a></li>
<li><a href="#trunkgithubworkflowsphpunittestsyml">trunk/.github/workflows/phpunit-tests.yml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgithubworkflowsphpunittestsrunyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/phpunit-tests-run.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/phpunit-tests-run.yml 2023-08-24 13:08:40 UTC (rev 56439)
+++ trunk/.github/workflows/phpunit-tests-run.yml 2023-08-24 13:28:26 UTC (rev 56440)
</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"> description: 'Database version'
</span><span class="cx" style="display: block; padding: 0 10px"> required: false
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'string'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- default: '5.7'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ default: '8.0'
</ins><span class="cx" style="display: block; padding: 0 10px"> multisite:
</span><span class="cx" style="display: block; padding: 0 10px"> description: 'Whether to run tests as multisite'
</span><span class="cx" style="display: block; padding: 0 10px"> required: false
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'string'
</span><span class="cx" style="display: block; padding: 0 10px"> default: 'phpunit.xml.dist'
</span><span class="cx" style="display: block; padding: 0 10px"> report:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- description: 'Whether to report results to WordPress.org hosting tests'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ description: 'Whether to report results to WordPress.org Hosting Tests'
</ins><span class="cx" style="display: block; padding: 0 10px"> required: false
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'boolean'
</span><span class="cx" style="display: block; padding: 0 10px"> default: false
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_DB_VERSION: ${{ inputs.db-version }}
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
</span><span class="cx" style="display: block; padding: 0 10px"> PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px"> # Runs the PHPUnit tests for WordPress.
</span></span></pre></div>
<a id="trunkgithubworkflowsphpunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/phpunit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/phpunit-tests.yml 2023-08-24 13:08:40 UTC (rev 56439)
+++ trunk/.github/workflows/phpunit-tests.yml 2023-08-24 13:28:26 UTC (rev 56440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,10 +30,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Any needed permissions should be configured at the job level.
</span><span class="cx" style="display: block; padding: 0 10px"> permissions: {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-env:
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
- LOCAL_PHP_MEMCACHED: ${{ false }}
-
</del><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Creates a PHPUnit test job for each PHP/MySQL combination.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> test-with-mysql:
</span><span class="cx" style="display: block; padding: 0 10px"> name: PHP ${{ matrix.php }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: desrosj/wordpress-develop/.github/workflows/phpunit-tests-run.yml@expanded-db-testing-callable-workflow
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> permissions:
</span><span class="cx" style="display: block; padding: 0 10px"> contents: read
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> db-version: '5.7'
</span><span class="cx" style="display: block; padding: 0 10px"> multisite: true
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: true
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Report the results of the PHP 7.4 without memcached job.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Report test results to the Host Test Results.
</ins><span class="cx" style="display: block; padding: 0 10px"> - os: ubuntu-latest
</span><span class="cx" style="display: block; padding: 0 10px"> php: '7.4'
</span><span class="cx" style="display: block; padding: 0 10px"> db-type: 'mysql'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> test-with-mariadb:
</span><span class="cx" style="display: block; padding: 0 10px"> name: PHP ${{ matrix.php }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: desrosj/wordpress-develop/.github/workflows/phpunit-tests-run.yml@expanded-db-testing-callable-workflow
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> permissions:
</span><span class="cx" style="display: block; padding: 0 10px"> contents: read
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +100,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> db-version: [ '10.4', '10.6', '10.11', '11.0' ]
</span><span class="cx" style="display: block; padding: 0 10px"> multisite: [ false, true ]
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: [ false ]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- report: [ false ]
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include:
</span><span class="cx" style="display: block; padding: 0 10px"> # Include jobs for PHP 7.4 with memcached.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +109,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> db-version: '11.0'
</span><span class="cx" style="display: block; padding: 0 10px"> multisite: false
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: true
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- report: false
</del><span class="cx" style="display: block; padding: 0 10px"> - os: ubuntu-latest
</span><span class="cx" style="display: block; padding: 0 10px"> php: '7.4'
</span><span class="cx" style="display: block; padding: 0 10px"> db-type: 'mariadb'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +115,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> db-version: '11.0'
</span><span class="cx" style="display: block; padding: 0 10px"> multisite: true
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: true
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- report: false
</del><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> os: ${{ matrix.os }}
</span><span class="cx" style="display: block; padding: 0 10px"> php: ${{ matrix.php }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> multisite: ${{ matrix.multisite }}
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: ${{ matrix.memcached }}
</span><span class="cx" style="display: block; padding: 0 10px"> phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- report: ${{ matrix.report }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ report: ${{ matrix.report || false }}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> slack-notifications:
</span><span class="cx" style="display: block; padding: 0 10px"> name: Slack Notifications
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> github.event_name != 'pull_request' &&
</span><span class="cx" style="display: block; padding: 0 10px"> github.run_attempt < 2 &&
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ needs.test-with-mysql.result == 'cancelled' || needs.test-with-mysql.result == 'failure' ||
+ needs.test-with-mariadb.result == 'cancelled' || needs.test-with-mariadb.result == 'failure'
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span></span></pre>
</div>
</div>
</body>
</html>