diff --git a/.travis.yml b/.travis.yml index c4bef391b..b4a9d3220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,18 @@ language: python +go: + - 1.5 + services: - rabbitmq - mysql # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS +# gimme has to be kept in sync with Boulder's Go version setting in .travis.yml before_install: - travis_retry sudo ./bootstrap/ubuntu.sh - travis_retry sudo apt-get install --no-install-recommends nginx-light openssl + - '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || eval "$(gimme 1.5)"' # using separate envs with different TOXENVs creates 4x1 Travis build # matrix, which allows us to clearly distinguish which component under diff --git a/docs/contributing.rst b/docs/contributing.rst index 5aa6e3e76..af7945d60 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -67,7 +67,7 @@ The following tools are there to help you: Integration ~~~~~~~~~~~ -First, install `Go`_ 1.4 and start Boulder_, an ACME CA server:: +First, install `Go`_ 1.5 and start Boulder_, an ACME CA server:: ./tests/boulder-start.sh