<!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>[53350] branches/6.0/tests/phpunit: Build/Test Tools: Pass GitHub Actions environment variables to the Docker container.</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/53350">53350</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/53350","name":"Review Commit"}}</script></dd>

<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>

<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-04 11:42:42 +0000 (Wed, 04 May 2022)</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: Pass GitHub Actions environment variables to the Docker container.

This ensures that `WP_UnitTestCase::skipOnAutomatedBranches()` has access to the `GITHUB_REF` and `GITHUB_EVENT_NAME` variables, so that some tests can be skipped when appropriate.

Additionally, account for renaming the `master` branch to `trunk` in November 2021.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/40241">[40241]</a>, <a href="https://core.trac.wordpress.org/changeset/46999">[46999]</a>, <a href="https://core.trac.wordpress.org/changeset/49264">[49264]</a>, <a href="https://core.trac.wordpress.org/changeset/49267">[49267]</a>, <a href="https://core.trac.wordpress.org/changeset/51868">[51868]</a>.

Merges <a href="https://core.trac.wordpress.org/changeset/53349">[53349]</a> to the 6.0 branch.

Fixes <a href="https://core.trac.wordpress.org/ticket/55668">#55668</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#branches60dockercomposeyml">branches/6.0/docker-compose.yml</a></li>

<li><a href="#branches60testsphpunitincludesabstracttestcasephp">branches/6.0/tests/phpunit/includes/abstract-testcase.php</a></li>

<li><a href="#branches60testsphpunittestsbasicphp">branches/6.0/tests/phpunit/tests/basic.php</a></li>

<li><a href="#branches60testsphpunittestsexternalhttpbasicphp">branches/6.0/tests/phpunit/tests/external-http/basic.php</a></li>

<li><a href="#branches60testsphpunitteststhemephp">branches/6.0/tests/phpunit/tests/theme.php</a></li>

</ul>

<h3>Property Changed</h3>

<ul>

<li><a href="#branches60">branches/6.0/</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.0

</span><span class="cx" style="display: block; padding: 0 10px">===================================================================

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.0 2022-05-04 00:38:18 UTC (rev 53349)

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.0  2022-05-04 11:42:42 UTC (rev 53350)

</ins><a id="branches60"></a>

<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.0</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">-/branches/5.8:51889

</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">+/branches/5.8:51889

+/trunk:53349

</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property

</span><a id="branches60dockercomposeyml"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/docker-compose.yml</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/docker-compose.yml   2022-05-04 00:38:18 UTC (rev 53349)

+++ branches/6.0/docker-compose.yml     2022-05-04 11:42:42 UTC (rev 53350)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +41,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">       - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}

</span><span class="cx" style="display: block; padding: 0 10px">       - PHP_FPM_UID=${PHP_FPM_UID-1000}

</span><span class="cx" style="display: block; padding: 0 10px">       - PHP_FPM_GID=${PHP_FPM_GID-1000}

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+      - GITHUB_REF=${GITHUB_REF-false}

+      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">     volumes:

</span><span class="cx" style="display: block; padding: 0 10px">       - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini

</span></span></pre></div>

<a id="branches60testsphpunitincludesabstracttestcasephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/includes/abstract-testcase.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/includes/abstract-testcase.php 2022-05-04 00:38:18 UTC (rev 53349)

+++ branches/6.0/tests/phpunit/includes/abstract-testcase.php   2022-05-04 11:42:42 UTC (rev 53350)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,8 +202,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Allows tests to be skipped on some automated runs.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * For test runs on GitHub Actions for something other than trunk/master,

-        * we want to skip tests that only need to run for master.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * For test runs on GitHub Actions for something other than trunk,

+        * we want to skip tests that only need to run for trunk.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        public function skipOnAutomatedBranches() {

</span><span class="cx" style="display: block; padding: 0 10px">                // https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,12 +210,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $github_event_name = getenv( 'GITHUB_EVENT_NAME' );

</span><span class="cx" style="display: block; padding: 0 10px">                $github_ref        = getenv( 'GITHUB_REF' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $github_event_name && 'false' !== $github_event_name ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $github_event_name ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                         // We're on GitHub Actions.

</span><span class="cx" style="display: block; padding: 0 10px">                        $skipped = array( 'pull_request', 'pull_request_target' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/master' !== $github_ref ) {

-                               $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/trunk' !== $github_ref ) {

+                               $this->markTestSkipped( 'For automated test runs, this test is only run on trunk' );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="branches60testsphpunittestsbasicphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/tests/basic.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/tests/basic.php        2022-05-04 00:38:18 UTC (rev 53349)

+++ branches/6.0/tests/phpunit/tests/basic.php  2022-05-04 11:42:42 UTC (rev 53350)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Basic extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_license() {

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // This test is designed to only run on trunk/master.