Skip to content

Commit

Permalink
refactor references to travis-ci.com
Browse files Browse the repository at this point in the history
  • Loading branch information
KristoforMaynard committed Jun 2, 2018
1 parent 285d5d3 commit ad1bc11
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Both the master and dev branches should make every attempt to be usable (thanks

Branch | Docs | Test Status
------------- | ------------------------------------------------------------------------- | -----------------------
[master](https://github.com/viscid-hub/Viscid) | [html](http://viscid-hub.github.io/Viscid-docs/docs/master/index.html), [test summary](http://viscid-hub.github.io/Viscid-docs/summary/master-2.7/index.html) | [![Build Status](https://travis-ci.org/viscid-hub/Viscid.svg?branch=master)](https://travis-ci.org/viscid-hub/Viscid)
[dev](https://github.com/viscid-hub/Viscid/tree/dev) | [html](http://viscid-hub.github.io/Viscid-docs/docs/dev/index.html), [test summary](http://viscid-hub.github.io/Viscid-docs/summary/dev-2.7/index.html) | [![Build Status](https://travis-ci.org/viscid-hub/Viscid.svg?branch=dev)](https://travis-ci.org/viscid-hub/Viscid)
[master](https://github.com/viscid-hub/Viscid) | [html](http://viscid-hub.github.io/Viscid-docs/docs/master/index.html), [test summary](http://viscid-hub.github.io/Viscid-docs/summary/master-2.7/index.html) | [![Build Status](https://travis-ci.com/viscid-hub/Viscid.svg?branch=master)](https://travis-ci.com/viscid-hub/Viscid)
[dev](https://github.com/viscid-hub/Viscid/tree/dev) | [html](http://viscid-hub.github.io/Viscid-docs/docs/dev/index.html), [test summary](http://viscid-hub.github.io/Viscid-docs/summary/dev-2.7/index.html) | [![Build Status](https://travis-ci.com/viscid-hub/Viscid.svg?branch=dev)](https://travis-ci.com/viscid-hub/Viscid)

## Install ##

Expand Down
2 changes: 1 addition & 1 deletion deploy_ghpages
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if [[ -n ${TRAVIS} && -n ${CONTINUOUS_INTEGRATION} ]]; then
# target repository's deployment keys on github.
repo="[email protected]:${repo_slug}.git"
git config --global user.name "Travis-CI"
git config --global user.email "nobody@travis-ci.org"
git config --global user.email "nobody@travis-ci.com"
git config --global push.default simple
else
# this scipt is probably being run locally, so let's assume the user
Expand Down
2 changes: 1 addition & 1 deletion doc/dev_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ That all being said, there are a couple places where importing pyplot / vpyplot
Continuous Integration
----------------------

This project uses `Travis-CI <http://travis-ci.org>`_ for continuous integration. By default, tests run whenever commits are pushed or pull requests are made to the main git repository on GitHub. Test summary pages are automatically uploaded to GitHub Pages in the ``summary`` directory. In addition, commits to ``master`` and ``dev`` automatically update the html documentation and push the changes to GitHub Pages.
This project uses `Travis-CI <http://travis-ci.com>`_ for continuous integration. By default, tests run whenever commits are pushed or pull requests are made to the main git repository on GitHub. Test summary pages are automatically uploaded to GitHub Pages in the ``summary`` directory. In addition, commits to ``master`` and ``dev`` automatically update the html documentation and push the changes to GitHub Pages.

Forks can use Travis-CI by enabling it for their own GitHub accounts. The caveat is that commits to ``master`` and ``dev`` from forked repositories will not update GitHub Pages.

Expand Down
8 changes: 4 additions & 4 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ Branch Test Status Docs
.. _tests_master: http://viscid-hub.github.io/Viscid-docs/summary/master-2.7/index.html
.. |travis-master| raw:: html

<a href="https://travis-ci.org/viscid-hub/Viscid">
<img src="https://travis-ci.org/viscid-hub/Viscid.svg?branch=master"
<a href="https://travis-ci.com/viscid-hub/Viscid">
<img src="https://travis-ci.com/viscid-hub/Viscid.svg?branch=master"
</a>

.. _dev: https://github.com/viscid-hub/Viscid/tree/dev
.. _html_dev: http://viscid-hub.github.io/Viscid-docs/docs/dev/index.html
.. _tests_dev: http://viscid-hub.github.io/Viscid-docs/summary/dev-2.7/index.html
.. |travis-dev| raw:: html

<a href="https://travis-ci.org/viscid-hub/Viscid">
<img src="https://travis-ci.org/viscid-hub/Viscid.svg?branch=dev"
<a href="https://travis-ci.com/viscid-hub/Viscid">
<img src="https://travis-ci.com/viscid-hub/Viscid.svg?branch=dev"
</a>

Installation
Expand Down
2 changes: 1 addition & 1 deletion tests/viscid_make_summary_page
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def main():
jobid = os.environ["TRAVIS_JOB_ID"]
jobnum = os.environ["TRAVIS_JOB_NUMBER"]
reposlug = os.environ["TRAVIS_REPO_SLUG"]
info["Travis-CI Job"] = ("<a href=https://travis-ci.org/{0}/jobs/{1}>{2}</a>"
info["Travis-CI Job"] = ("<a href=https://travis-ci.com/{0}/jobs/{1}>{2}</a>"
"".format(reposlug, jobid, jobnum))
except KeyError:
pass
Expand Down

0 comments on commit ad1bc11

Please sign in to comment.