<!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>[40274] branches/4.5: Build/Test tools: Get Travis builds working on HHVM again.</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 { 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/40274">40274</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/40274","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-03-11 00:13:53 +0000 (Sat, 11 Mar 2017)</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: Get Travis builds working on HHVM again.
This change moves to specifying the PHPUnit version for all PHP versions, and fixes an issue where the Composer global bin directory is not at `~/.composer/vendor/bin` on the boxes that are used for HHVM builds.
See <a href="https://core.trac.wordpress.org/ticket/40100">#40100</a>
Merges <a href="https://core.trac.wordpress.org/changeset/40269">[40269]</a> and <a href="https://core.trac.wordpress.org/changeset/40271">[40271]</a> to the 4.5 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches45travisyml">branches/4.5/.travis.yml</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches45">branches/4.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.5
</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/4.5 2017-03-11 00:09:28 UTC (rev 40273)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.5 2017-03-11 00:13:53 UTC (rev 40274)
</ins><a id="branches45"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.5</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/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.6:38615
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,37192,37228,37247,37249,37273,37282,37285,37288,37301,37352,37417,37433,37435,37448,37452,37472,37525-37527,37559,37651,37678,37708,37710,37724,37729-37730,37748,37755,38524,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40255,40257-40259
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,37192,37228,37247,37249,37273,37282,37285,37288,37301,37352,37417,37433,37435,37448,37452,37472,37525-37527,37559,37651,37678,37708,37710,37724,37729-37730,37748,37755,38524,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40255,40257-40259,40269,40271
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches45travisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/.travis.yml 2017-03-11 00:09:28 UTC (rev 40273)
+++ branches/4.5/.travis.yml 2017-03-11 00:13:53 UTC (rev 40274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - node_modules
</span><span class="cx" style="display: block; padding: 0 10px"> matrix:
</span><span class="cx" style="display: block; padding: 0 10px"> include:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - php: 5.5
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - php: 7.0
</ins><span class="cx" style="display: block; padding: 0 10px"> env: WP_TRAVISCI=travis:js
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 5.2
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_TRAVISCI=travis:phpunit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,17 +48,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span><span class="cx" style="display: block; padding: 0 10px"> before_script:
</span><span class="cx" style="display: block; padding: 0 10px"> - |
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Remove Xdebug for a huge performance increase, but not from nightly or hhvm:
</ins><span class="cx" style="display: block; padding: 0 10px"> stable='^[0-9\.]+$'
</span><span class="cx" style="display: block; padding: 0 10px"> if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then
</span><span class="cx" style="display: block; padding: 0 10px"> phpenv config-rm xdebug.ini
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- export PATH="$HOME/.composer/vendor/bin:$PATH"
</del><span class="cx" style="display: block; padding: 0 10px"> - |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
- composer global require "phpunit/phpunit=5.7.*"
- elif [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
- composer global require "phpunit/phpunit=4.8.*"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Export Composer's global bin dir to PATH, but not on PHP 5.2:
+ if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
+ composer config --list --global
+ export PATH=`composer config --list --global | grep '\[home\]' | { read a; echo "${a#* }/vendor/bin:$PATH"; }`
</ins><span class="cx" style="display: block; padding: 0 10px"> fi
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+- |
+ # Install the specified version of PHPUnit depending on the PHP version:
+ if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
+ case "$TRAVIS_PHP_VERSION" in
+ 7.1|7.0|hhvm|nightly)
+ echo "Using PHPUnit 5.7"
+ composer global require "phpunit/phpunit=5.7.*"
+ ;;
+ 5.6|5.5|5.4|5.3)
+ echo "Using PHPUnit 4.8"
+ composer global require "phpunit/phpunit=4.8.*"
+ ;;
+ 5.2)
+ # Do nothing, use default PHPUnit 3.6.x
+ echo "Using default PHPUnit, hopefully 3.6"
+ ;;
+ *)
+ echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
+ exit 1
+ ;;
+ esac
+ fi
</ins><span class="cx" style="display: block; padding: 0 10px"> - npm --version
</span><span class="cx" style="display: block; padding: 0 10px"> - node --version
</span><span class="cx" style="display: block; padding: 0 10px"> - nvm install 4.7.2
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,9 +90,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - mysql --version
</span><span class="cx" style="display: block; padding: 0 10px"> - phpenv versions
</span><span class="cx" style="display: block; padding: 0 10px"> - php --version
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- php -m
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+- |
+ # Debug PHP extensions, but not on HHVM because the command hangs indefinitely:
+ if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' ]]; then
+ php -m
+ fi
</ins><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">+- which phpunit
</ins><span class="cx" style="display: block; padding: 0 10px"> - phpunit --version
</span><span class="cx" style="display: block; padding: 0 10px"> - curl --version
</span><span class="cx" style="display: block; padding: 0 10px"> - grunt --version
</span></span></pre>
</div>
</div>
</body>
</html>