<!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>[BuddyPress][10976] trunk: Travis-CI: fix up indentation inconsistencies.</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="http://buddypress.trac.wordpress.org/changeset/10976">10976</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10976","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-01 15:31:13 +0000 (Mon, 01 Aug 2016)</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'>Travis-CI: fix up indentation inconsistencies.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkeditorconfig">trunk/.editorconfig</a></li>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkeditorconfig"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.editorconfig</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.editorconfig 2016-08-01 15:26:28 UTC (rev 10975)
+++ trunk/.editorconfig 2016-08-01 15:31:13 UTC (rev 10976)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trim_trailing_whitespace = true
</span><span class="cx" style="display: block; padding: 0 10px"> indent_style = tab
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-[{*.json,*.yml}]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+[{.jshintrc,*.json,*.yml}]
</ins><span class="cx" style="display: block; padding: 0 10px"> indent_style = space
</span><span class="cx" style="display: block; padding: 0 10px"> indent_size = 2
</span></span></pre></div>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2016-08-01 15:26:28 UTC (rev 10975)
+++ trunk/.travis.yml 2016-08-01 15:31:13 UTC (rev 10976)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,21 +12,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - node_modules
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> php:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - 5.2
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - 7.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - 5.2
+ - 5.3
+ - 5.4
+ - 5.5
+ - 5.6
+ - 7.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # WordPress comes from the Git mirror, where 'master' mirrors svn 'trunk' and
</span><span class="cx" style="display: block; padding: 0 10px"> # x.y mirrors the latest from the x.y branch
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - WP_VERSION=master BP_TRAVISCI=travis:phpunit
- - WP_VERSION=4.5 BP_TRAVISCI=travis:phpunit
- - WP_VERSION=4.4 BP_TRAVISCI=travis:phpunit
- - WP_VERSION=4.3 BP_TRAVISCI=travis:phpunit
- - WP_VERSION=4.2 BP_TRAVISCI=travis:phpunit
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - WP_VERSION=master BP_TRAVISCI=travis:phpunit
+ - WP_VERSION=4.5 BP_TRAVISCI=travis:phpunit
+ - WP_VERSION=4.4 BP_TRAVISCI=travis:phpunit
+ - WP_VERSION=4.3 BP_TRAVISCI=travis:phpunit
+ - WP_VERSION=4.2 BP_TRAVISCI=travis:phpunit
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> matrix:
</span><span class="cx" style="display: block; padding: 0 10px"> fast_finish: true
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,49 +54,49 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # before_install: Failures in this section will result in build status 'errored'
</span><span class="cx" style="display: block; padding: 0 10px"> before_install:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # set up WP install
- - export WP_DEVELOP_DIR=/tmp/wordpress/
- - mkdir -p $WP_DEVELOP_DIR
- - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
- - plugin_slug=$(basename $(pwd))
- - plugin_dir=$WP_DEVELOP_DIR/src/wp-content/plugins/$plugin_slug
- - cd ..
- - mv $plugin_slug $plugin_dir
- # set up tests config
- - cd $WP_DEVELOP_DIR
- - echo $WP_DEVELOP_DIR
- - cp wp-tests-config-sample.php wp-tests-config.php
- - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
- - sed -i "s/yourusernamehere/root/" wp-tests-config.php
- - sed -i "s/yourpasswordhere//" wp-tests-config.php
- # set up database
- - mysql -e 'CREATE DATABASE wordpress_test;' -uroot
- # prepare for running the tests
- - cd $plugin_dir
- - gem install scss_lint
- # setup NodeJS version using NVM
- - node --version
- - nvm install 4
- - node --version
- - npm install -g grunt-cli
- - npm --version
- - mysql --version
- - phpenv versions
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # set up WP install
+ - export WP_DEVELOP_DIR=/tmp/wordpress/
+ - mkdir -p $WP_DEVELOP_DIR
+ - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
+ - plugin_slug=$(basename $(pwd))
+ - plugin_dir=$WP_DEVELOP_DIR/src/wp-content/plugins/$plugin_slug
+ - cd ..
+ - mv $plugin_slug $plugin_dir
+ # set up tests config
+ - cd $WP_DEVELOP_DIR
+ - echo $WP_DEVELOP_DIR
+ - cp wp-tests-config-sample.php wp-tests-config.php
+ - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
+ - sed -i "s/yourusernamehere/root/" wp-tests-config.php
+ - sed -i "s/yourpasswordhere//" wp-tests-config.php
+ # set up database
+ - mysql -e 'CREATE DATABASE wordpress_test;' -uroot
+ # prepare for running the tests
+ - cd $plugin_dir
+ - gem install scss_lint
+ # setup NodeJS version using NVM
+ - node --version
+ - nvm install 4
+ - node --version
+ - npm install -g grunt-cli
+ - npm --version
+ - mysql --version
+ - phpenv versions
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # before_script: Failures in this section will result in build status 'errored'
</span><span class="cx" style="display: block; padding: 0 10px"> before_script:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - npm install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - npm install
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Run tests
</span><span class="cx" style="display: block; padding: 0 10px"> script: grunt $BP_TRAVISCI
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> notifications:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- email: false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ email: false
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- irc:
- channels:
- - secure: "Z+gAlyOafrw0Xg294np+7IpqOKTsswGjAWyOZsbzT7Xo8uY1nmz8tTuU50Gpo8jo5HQqG9G0QgI3zB3Cxy3M5dF+J5oLl1lBz1zL0mtHiq1HoXi2cbVnGCCpxtMvYII6UmPUGAg8zvNUQol+cw1jb3PzLwEDfGcDH64o/Z3j8Gg="
- template:
- - "Build %{build_number} (%{branch} - %{commit}): %{message} %{build_url}"
- slack:
- secure: JQT+HWoVhLzoG00HmJscYZO+Gy7ywnIlrUbCaI7DxFdFOIkKxsTLLq9cKE4y3VqgZAARTOKjP1eQ7a5OEg1vT11Ow+rB7iUAMNmITxXO4feTOx1i2673xRNBro/SZMhlLd7DY2erbMDZaG9hBQB4xLXRYOvP29pLxf5zTSyZMyE=
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ irc:
+ channels:
+ - secure: "Z+gAlyOafrw0Xg294np+7IpqOKTsswGjAWyOZsbzT7Xo8uY1nmz8tTuU50Gpo8jo5HQqG9G0QgI3zB3Cxy3M5dF+J5oLl1lBz1zL0mtHiq1HoXi2cbVnGCCpxtMvYII6UmPUGAg8zvNUQol+cw1jb3PzLwEDfGcDH64o/Z3j8Gg="
+ template:
+ - "Build %{build_number} (%{branch} - %{commit}): %{message} %{build_url}"
+ slack:
+ secure: JQT+HWoVhLzoG00HmJscYZO+Gy7ywnIlrUbCaI7DxFdFOIkKxsTLLq9cKE4y3VqgZAARTOKjP1eQ7a5OEg1vT11Ow+rB7iUAMNmITxXO4feTOx1i2673xRNBro/SZMhlLd7DY2erbMDZaG9hBQB4xLXRYOvP29pLxf5zTSyZMyE=
</ins></span></pre>
</div>
</div>
</body>
</html>