From b2b042837f808a256e1e57a3747bbfb11e04dc31 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 22 Aug 2015 10:19:51 +0000 Subject: [PATCH 1/4] Use Go 1.5. The following PRs broke our unittests: - https://github.com/letsencrypt/boulder/pull/642 - https://github.com/letsencrypt/boulder/pull/635 --- .travis.yml | 3 +++ docs/contributing.rst | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4bef391b..ad9655808 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: python +# This have to be kept in sync with .travis.yml from Boulder +go: 1.5 + services: - rabbitmq - mysql 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 From 529df611b2439f80853b093f81dde3885c7e3903 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Mon, 24 Aug 2015 20:09:19 +0000 Subject: [PATCH 2/4] Travis: different syntax for Go 1.5 version --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad9655808..fb659e484 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: python # This have to be kept in sync with .travis.yml from Boulder -go: 1.5 +go: + - 1.5 services: - rabbitmq From 165082b37be079acaab741e3e7afa8463d0a6476 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Mon, 24 Aug 2015 20:26:04 +0000 Subject: [PATCH 3/4] Travis: use gimme for Go 1.5 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fb659e484..42996ceaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python -# This have to be kept in sync with .travis.yml from Boulder go: - 1.5 @@ -9,9 +8,11 @@ services: - 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 + - 'eval "$(gimme 1.5)"' # using separate envs with different TOXENVs creates 4x1 Travis build # matrix, which allows us to clearly distinguish which component under From 504ade8af556eeb54abf4a234c50ce343ee2a59c Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Mon, 24 Aug 2015 20:29:25 +0000 Subject: [PATCH 4/4] Travis: gimme 1.5 only for integration tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 42996ceaa..b4a9d3220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ services: before_install: - travis_retry sudo ./bootstrap/ubuntu.sh - travis_retry sudo apt-get install --no-install-recommends nginx-light openssl - - 'eval "$(gimme 1.5)"' + - '[ "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