<!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>[50697] trunk: Build/Test Tools: Remove remaining Travis CI references.</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/50697">50697</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/50697","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-04-10 12:05:50 +0000 (Sat, 10 Apr 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: Remove remaining Travis CI references.
* Remove `travis:` tasks in Gruntfile.js.
* Remove status badge in README.md that comes from Travis CI via shields.io.
* Remove Travis CI related skipping in the `WP_UnitTestCase_Base::skipOnAutomatedBranches()` test method and related Docker environment variables.
Props johnbillion, SergeyBiryukov, ocean90.
See <a href="https://core.trac.wordpress.org/ticket/52161">#52161</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/52666">#52666</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkREADMEmd">trunk/README.md</a></li>
<li><a href="#trunkdockercomposeyml">trunk/docker-compose.yml</a></li>
<li><a href="#trunkphpcsxmldist">trunk/phpcs.xml.dist</a></li>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2021-04-10 11:59:19 UTC (rev 50696)
+++ trunk/Gruntfile.js 2021-04-10 12:05:50 UTC (rev 50697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,15 +1639,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var done = this.async();
</span><span class="cx" style="display: block; padding: 0 10px"> var flags = this.flags;
</span><span class="cx" style="display: block; padding: 0 10px"> var args = changedFiles.php;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( flags.travisErrors ) {
- // We can check the entire codebase for coding standards errors.
- args = [ 'lint:errors' ];
- } else if ( flags.travisWarnings ) {
- // We can check the tests directory for errors and warnings.
- args = [ 'lint', 'tests' ];
- } else {
- args.unshift( 'lint' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ args.unshift( 'lint' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.util.spawn( {
</span><span class="cx" style="display: block; padding: 0 10px"> cmd: 'composer',
</span><span class="cx" style="display: block; padding: 0 10px"> args: args,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1661,11 +1655,6 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Travis CI tasks.
- grunt.registerTask('travis:js', 'Runs JavaScript Travis CI tasks.', [ 'jshint:corejs', 'qunit:compiled' ]);
- grunt.registerTask('travis:phpunit', 'Runs PHPUnit Travis CI tasks.', [ 'build', 'phpunit' ]);
- grunt.registerTask('travis:phpcs', 'Runs PHP Coding Standards Travis CI tasks.', [ 'format:php:error', 'lint:php:travisErrors:error', 'lint:php:travisWarnings:error' ]);
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Patch task.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.renameTask('patch_wordpress', 'patch');
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkREADMEmd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/README.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/README.md 2021-04-10 11:59:19 UTC (rev 50696)
+++ trunk/README.md 2021-04-10 12:05:50 UTC (rev 50697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # WordPress
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-[](https://travis-ci.com/WordPress/wordpress-develop)
-
</del><span class="cx" style="display: block; padding: 0 10px"> Welcome to the WordPress development repository! Please check out the [contributor handbook](https://make.wordpress.org/core/handbook/) for information about how to open bug reports, contribute patches, test changes, write documentation, or get involved in any way you can.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> * [Getting Started](#getting-started)
</span></span></pre></div>
<a id="trunkdockercomposeyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/docker-compose.yml 2021-04-10 11:59:19 UTC (rev 50696)
+++ trunk/docker-compose.yml 2021-04-10 12:05:50 UTC (rev 50697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,8 +108,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WP_MULTISITE: ${WP_MULTISITE-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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- TRAVIS_BRANCH: ${TRAVIS_BRANCH-false}
- TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false}
</del><span class="cx" style="display: block; padding: 0 10px"> GITHUB_REF: ${GITHUB_REF-false}
</span><span class="cx" style="display: block; padding: 0 10px"> GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkphpcsxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpcs.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpcs.xml.dist 2021-04-10 11:59:19 UTC (rev 50696)
+++ trunk/phpcs.xml.dist 2021-04-10 12:05:50 UTC (rev 50697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </properties>
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!-- Exclude the build folder in the current directory, as Travis puts the checkout in a build directory. -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Exclude the build folder in the current directory. -->
</ins><span class="cx" style="display: block; padding: 0 10px"> <exclude-pattern type="relative">^build/*</exclude-pattern>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Directories and third party library exclusions. -->
</span></span></pre></div>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2021-04-10 11:59:19 UTC (rev 50696)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2021-04-10 12:05:50 UTC (rev 50697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,14 +181,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Allow 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 Travis/GitHub Actions for something other than trunk/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/master,
</ins><span class="cx" style="display: block; padding: 0 10px"> * we want to skip tests that only need to run for master.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function skipOnAutomatedBranches() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
- $travis_branch = getenv( 'TRAVIS_BRANCH' );
- $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' );
-
</del><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="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="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,11 +196,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/master' !== $github_ref ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $travis_branch && 'false' !== $travis_branch ) {
- // We're on Travis CI.
- if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) {
- $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
- }
</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">
</span></span></pre>
</div>
</div>
</body>
</html>