From 8e5d79746c59cace79b68b4b47a298a3b85e31f9 Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 5 Nov 2013 13:15:18 -0800 Subject: First crack at building w/ openssl 0.9.8 on travis. --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index cf6ecefa..136ddb65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,23 @@ env: - TOX_ENV=py32 CC=clang - TOX_ENV=py33 CC=clang - TOX_ENV=pypy CC=clang + - TOX_ENV=py26 OPENSSL=0.9.8 + - TOX_ENV=py27 OPENSSL=0.9.8 + - TOX_ENV=py32 OPENSSL=0.9.8 + - TOX_ENV=py33 OPENSSL=0.9.8 + - TOX_ENV=pypy OPENSSL=0.9.8 + - TOX_ENV=py26 CC=clang OPENSSL=0.9.8 + - TOX_ENV=py27 CC=clang OPENSSL=0.9.8 + - TOX_ENV=py32 CC=clang OPENSSL=0.9.8 + - TOX_ENV=py33 CC=clang OPENSSL=0.9.8 + - TOX_ENV=pypy CC=clang OPENSSL=0.9.8 - TOX_ENV=docs - TOX_ENV=pep8 - TOX_ENV=py3pep8 install: + - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu lucid main\" || true" + - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y update && sudo apt-get -y install libssl-dev/lucid || true" - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true" - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true" # This is required because we need to get rid of the Travis installed PyPy -- cgit v1.2.3 From 940f25a1e1a5365f7af48b4f3f266e2155640806 Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 5 Nov 2013 13:44:39 -0800 Subject: Extra yes and check for expected openssl version. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 136ddb65..547d2b58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ env: install: - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu lucid main\" || true" - - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y update && sudo apt-get -y install libssl-dev/lucid || true" + - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y update && sudo apt-get -y --force-yes install libssl-dev/lucid || true" - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true" - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true" # This is required because we need to get rid of the Travis installed PyPy @@ -36,6 +36,7 @@ install: - pip install tox script: + - "[[ ${OPENSSL} != "" ]] && openssl version | grep ${OPENSSL}" - tox -e $TOX_ENV notifications: -- cgit v1.2.3 From d43116e8d1fb8a22a25fa67a5983c421b84dcb8c Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 5 Nov 2013 13:46:03 -0800 Subject: String correctly. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 547d2b58..3cb27a9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,9 @@ install: - pip install tox script: - - "[[ ${OPENSSL} != "" ]] && openssl version | grep ${OPENSSL}" + # Make sure that if we installed an OPENSSL version then we got that + # version installed. + - "[[ ${OPENSSL} != \"\" ]] && openssl version | grep ${OPENSSL}" - tox -e $TOX_ENV notifications: -- cgit v1.2.3 From 745c5ecbaa4fdeacba75e17d5e8baf7915762f22 Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 5 Nov 2013 14:04:28 -0800 Subject: This check didn't work correctly because libssl-dev doesn't install the userland tools. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3cb27a9b..38da4624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,6 @@ install: - pip install tox script: - # Make sure that if we installed an OPENSSL version then we got that - # version installed. - - "[[ ${OPENSSL} != \"\" ]] && openssl version | grep ${OPENSSL}" - tox -e $TOX_ENV notifications: -- cgit v1.2.3 From e4fd1726b49a439fcffbaea99950784d1d1a020e Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 5 Nov 2013 14:19:17 -0800 Subject: Allow failures. --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 38da4624..97f11e3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,19 @@ env: - TOX_ENV=pep8 - TOX_ENV=py3pep8 +matrix: + allow_failures: + - TOX_ENV=py26 OPENSSL=0.9.8 + - TOX_ENV=py27 OPENSSL=0.9.8 + - TOX_ENV=py32 OPENSSL=0.9.8 + - TOX_ENV=py33 OPENSSL=0.9.8 + - TOX_ENV=pypy OPENSSL=0.9.8 + - TOX_ENV=py26 CC=clang OPENSSL=0.9.8 + - TOX_ENV=py27 CC=clang OPENSSL=0.9.8 + - TOX_ENV=py32 CC=clang OPENSSL=0.9.8 + - TOX_ENV=py33 CC=clang OPENSSL=0.9.8 + - TOX_ENV=pypy CC=clang OPENSSL=0.9.8 + install: - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu lucid main\" || true" - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y update && sudo apt-get -y --force-yes install libssl-dev/lucid || true" -- cgit v1.2.3 From 9d60716d7b716d313549f8e255001603d1b64986 Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 5 Nov 2013 14:30:36 -0800 Subject: Fix allow failures and only update once. --- .travis.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97f11e3d..a7b13e7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,22 +27,23 @@ env: matrix: allow_failures: - - TOX_ENV=py26 OPENSSL=0.9.8 - - TOX_ENV=py27 OPENSSL=0.9.8 - - TOX_ENV=py32 OPENSSL=0.9.8 - - TOX_ENV=py33 OPENSSL=0.9.8 - - TOX_ENV=pypy OPENSSL=0.9.8 - - TOX_ENV=py26 CC=clang OPENSSL=0.9.8 - - TOX_ENV=py27 CC=clang OPENSSL=0.9.8 - - TOX_ENV=py32 CC=clang OPENSSL=0.9.8 - - TOX_ENV=py33 CC=clang OPENSSL=0.9.8 - - TOX_ENV=pypy CC=clang OPENSSL=0.9.8 + - env: TOX_ENV=py26 OPENSSL=0.9.8 + - env: TOX_ENV=py27 OPENSSL=0.9.8 + - env: TOX_ENV=py32 OPENSSL=0.9.8 + - env: TOX_ENV=py33 OPENSSL=0.9.8 + - env: TOX_ENV=pypy OPENSSL=0.9.8 + - env: TOX_ENV=py26 CC=clang OPENSSL=0.9.8 + - env: TOX_ENV=py27 CC=clang OPENSSL=0.9.8 + - env: TOX_ENV=py32 CC=clang OPENSSL=0.9.8 + - env: TOX_ENV=py33 CC=clang OPENSSL=0.9.8 + - env: TOX_ENV=pypy CC=clang OPENSSL=0.9.8 install: - - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu lucid main\" || true" - - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y update && sudo apt-get -y --force-yes install libssl-dev/lucid || true" - - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true" - - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true" + - "sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu/ lucid main\"" + - sudo add-apt-repository -y ppa:pypy/ppa + - sudo apt-get -y update || true + - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y --force-yes install libssl-dev/lucid || true" + - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y install pypy || true" # This is required because we need to get rid of the Travis installed PyPy # or it'll take precedence over the PPA installed one. - "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin || true" -- cgit v1.2.3