Skip to content

Commit

Permalink
change master branch references in links etc. to version/2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ens-bwalts committed Aug 6, 2021
1 parent 487d751 commit 1b5b287
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
eHive
=====

[![Travis Build Status](https://travis-ci.org/Ensembl/ensembl-hive.svg?branch=master)](https://travis-ci.org/Ensembl/ensembl-hive)
[![Coverage Status](https://coveralls.io/repos/Ensembl/ensembl-hive/badge.svg?branch=master&service=github)](https://coveralls.io/github/Ensembl/ensembl-hive?branch=master)
[![Documentation Status](https://readthedocs.org/projects/ensembl-hive/badge/?version=master)](http://ensembl-hive.readthedocs.io/en/master)
[![codecov](https://codecov.io/gh/Ensembl/ensembl-hive/branch/master/graph/badge.svg)](https://codecov.io/gh/Ensembl/ensembl-hive/branch/master)
[![Travis Build Status](https://travis-ci.org/Ensembl/ensembl-hive.svg?branch=version/2.6)](https://travis-ci.org/Ensembl/ensembl-hive)
[![Coverage Status](https://coveralls.io/repos/Ensembl/ensembl-hive/badge.svg?branch=version/2.6&service=github)](https://coveralls.io/github/Ensembl/ensembl-hive?branch=version/2.6)
[![Documentation Status](https://readthedocs.org/projects/ensembl-hive/badge/?version=version-2.6)](http://ensembl-hive.readthedocs.io/en/version-2.6)
[![codecov](https://codecov.io/gh/Ensembl/ensembl-hive/branch/version%2F2.6/graph/badge.svg)](https://codecov.io/gh/Ensembl/ensembl-hive/branch/version%2F2.6)
[![Code Climate](https://codeclimate.com/github/Ensembl/ensembl-hive/badges/gpa.svg)](https://codeclimate.com/github/Ensembl/ensembl-hive)
[![Docker Build Status](https://img.shields.io/docker/build/ensemblorg/ensembl-hive.svg)](https://hub.docker.com/r/ensemblorg/ensembl-hive)

Expand All @@ -16,7 +16,7 @@ Available documentation
-----------------------

The main entry point is available online in the [user
manual](https://ensembl-hive.readthedocs.io/en/master/), from where it can
manual](https://ensembl-hive.readthedocs.io/en/version-2.6/), from where it can
be downloaded for offline access.


Expand Down Expand Up @@ -74,7 +74,7 @@ eHive has a generic interface named _Meadow_ that describes how to interact with
Sun Grid Engine (now known as Oracle Grid Engine),
[HTCondor](https://research.cs.wisc.edu/htcondor/),
[PBS Pro](http://www.pbspro.org),
[Docker Swarm](https://docs.docker.com/engine/swarm/) and maybe others. Read more about this on [the user manual](http://ensembl-hive.readthedocs.io/en/master/contrib/alternative_meadows.html).
[Docker Swarm](https://docs.docker.com/engine/swarm/) and maybe others. Read more about this on [the user manual](http://ensembl-hive.readthedocs.io/en/version-2.6/contrib/alternative_meadows.html).

Docker image
------------
Expand Down Expand Up @@ -106,7 +106,7 @@ Docker Swarm orchestrator, and thus on any cloud infrastructure that supports
it (e.g. [Amazon Web Services](https://docs.docker.com/docker-cloud/cloud-swarm/create-cloud-swarm-aws/),
[Microsoft Azure](https://docs.docker.com/docker-cloud/cloud-swarm/create-cloud-swarm-azure/)).

Read more about this on [the user manual](http://ensembl-hive.readthedocs.io/en/master/contrib/docker-swarm.html).
Read more about this on [the user manual](http://ensembl-hive.readthedocs.io/en/version-2.6/contrib/docker-swarm.html).

Contact us (mailing list)
-------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/rtd_upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ mkdir ../root
for i in *.deb; do dpkg -x "$i" ../root/; done

git clone --branch master --depth 1 https://github.com/Ensembl/ensembl.git ../ensembl
git clone --branch master --depth 1 https://github.com/Ensembl/ensembl-hive-docker-swarm.git ../ensembl-hive-docker-swarm
git clone --branch version/2.6 --depth 1 https://github.com/Ensembl/ensembl-hive-docker-swarm.git ../ensembl-hive-docker-swarm

rm -f ../../../contrib/docker-swarm
ln -s "$1/ensembl-hive-docker-swarm/docs" ../../../contrib/docker-swarm

0 comments on commit 1b5b287

Please sign in to comment.