From fbb128fa06b81d64d2e9d27f17d65685b3d6624c Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 9 Jan 2014 23:24:44 -0600 Subject: add brewed openssl to travis osx --- .travis.yml | 17 +---------------- .travis/install.sh | 4 ++++ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index babea99b..950cb487 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: - ./.travis/install.sh script: - - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV + - if [[ "$(uname -s)" == "Darwin" ]]; then export ARCHFLAGS="-arch x86_64" && export LDFLAGS="-L/usr/local/opt/openssl/lib" && export CFLAGS="-I/usr/local/opt/openssl/include" && eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV after_success: - coveralls @@ -63,21 +63,6 @@ matrix: - os: osx env: TOX_ENV=pypy compiler: gcc - - os: osx - env: TOX_ENV=py26 - compiler: clang - - os: osx - env: TOX_ENV=py27 - compiler: clang - - os: osx - env: TOX_ENV=py32 - compiler: clang - - os: osx - env: TOX_ENV=py33 - compiler: clang - - os: osx - env: TOX_ENV=pypy - compiler: clang - os: osx env: TOX_ENV=py26 OPENSSL=0.9.8 compiler: gcc diff --git a/.travis/install.sh b/.travis/install.sh index 8d6840f2..777ca87a 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -43,6 +43,10 @@ if [[ "$(uname -s)" == "Darwin" ]]; then ;; esac pyenv rehash + if [[ "${OPENSSL}" != "0.9.8" ]]; then + curl -O https://langui.sh/travis/openssl-1.0.1f.mavericks.bottle.tar.gz + brew install openssl-1.0.1f.mavericks.bottle.tar.gz + fi else # add mega-python ppa sudo add-apt-repository -y ppa:fkrull/deadsnakes -- cgit v1.2.3 From fff077f5de6877280e1172a504fd3c91a927fb99 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 9 Jan 2014 23:42:31 -0600 Subject: move script to separate file for readability --- .travis.yml | 2 +- .travis/run.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 .travis/run.sh diff --git a/.travis.yml b/.travis.yml index 950cb487..e77a3b26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: - ./.travis/install.sh script: - - if [[ "$(uname -s)" == "Darwin" ]]; then export ARCHFLAGS="-arch x86_64" && export LDFLAGS="-L/usr/local/opt/openssl/lib" && export CFLAGS="-I/usr/local/opt/openssl/include" && eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV + - ./.travis/run.sh after_success: - coveralls diff --git a/.travis/run.sh b/.travis/run.sh new file mode 100755 index 00000000..2d99f8c4 --- /dev/null +++ b/.travis/run.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +if [[ "$(uname -s)" == "Darwin" ]]; then + eval "$(pyenv init -)" + if [[ "${OPENSSL}" != "0.9.8" ]]; then + export ARCHFLAGS="-arch x86_64" + export LDFLAGS="-L/usr/local/opt/openssl/lib" + export CFLAGS="-I/usr/local/opt/openssl/include" + fi +fi +source ~/.venv/bin/activate +tox -e $TOX_ENV -- cgit v1.2.3 From ccb4f6f4d9ce86208cfe40451f390191e4bf3596 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 9 Jan 2014 23:42:53 -0600 Subject: let's see what version of openssl is already installed on these slaves --- .travis/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/install.sh b/.travis/install.sh index 777ca87a..3f0f8ffd 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -44,8 +44,10 @@ if [[ "$(uname -s)" == "Darwin" ]]; then esac pyenv rehash if [[ "${OPENSSL}" != "0.9.8" ]]; then + /usr/local/opt/openssl/bin/openssl version curl -O https://langui.sh/travis/openssl-1.0.1f.mavericks.bottle.tar.gz brew install openssl-1.0.1f.mavericks.bottle.tar.gz + /usr/local/opt/openssl/bin/openssl version fi else # add mega-python ppa -- cgit v1.2.3 From c4359578acac27d9709c284a1f350c44245c60ef Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 9 Jan 2014 23:51:30 -0600 Subject: remove unneeded openssl bottle --- .travis.yml | 2 +- .travis/install.sh | 6 ------ .travis/run.sh | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e77a3b26..a70bb8cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ script: - ./.travis/run.sh after_success: - - coveralls + - source ~/.venv/bin/activate && coveralls notifications: irc: diff --git a/.travis/install.sh b/.travis/install.sh index 3f0f8ffd..8d6840f2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -43,12 +43,6 @@ if [[ "$(uname -s)" == "Darwin" ]]; then ;; esac pyenv rehash - if [[ "${OPENSSL}" != "0.9.8" ]]; then - /usr/local/opt/openssl/bin/openssl version - curl -O https://langui.sh/travis/openssl-1.0.1f.mavericks.bottle.tar.gz - brew install openssl-1.0.1f.mavericks.bottle.tar.gz - /usr/local/opt/openssl/bin/openssl version - fi else # add mega-python ppa sudo add-apt-repository -y ppa:fkrull/deadsnakes diff --git a/.travis/run.sh b/.travis/run.sh index 2d99f8c4..8b3093df 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -6,6 +6,8 @@ set -x if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)" if [[ "${OPENSSL}" != "0.9.8" ]]; then + # travis has 1.0.1e installed via homebrew on OS X by default + # so set our flags to use that export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" -- cgit v1.2.3 From 26287be0dccc51730608475fdde8f0b3f474e20e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 12 Jan 2014 23:50:42 -0500 Subject: check if openssl is installed via homebrew on osx. install if not --- .travis/install.sh | 15 +++++++++++---- .travis/run.sh | 3 +-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 8d6840f2..fd210d43 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,10 +3,17 @@ set -e set -x -if [[ "${OPENSSL}" == "0.9.8" && "$(uname -s)" != "Darwin" ]]; then - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" - sudo apt-get -y update - sudo apt-get install -y --force-yes libssl-dev/lucid +if [[ "${OPENSSL}" == "0.9.8" ]]; then + if [[ "$(uname -s)" != "Darwin" ]]; then + sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" + sudo apt-get -y update + sudo apt-get install -y --force-yes libssl-dev/lucid + else + # travis has openssl installed via brew already, but let's be sure + if [[ "$(brew list | grep openssl)" != "openssl" ]]; then + brew install openssl + fi + fi fi if [[ "$(uname -s)" == "Darwin" ]]; then diff --git a/.travis/run.sh b/.travis/run.sh index 8b3093df..4c01d67a 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -6,8 +6,7 @@ set -x if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)" if [[ "${OPENSSL}" != "0.9.8" ]]; then - # travis has 1.0.1e installed via homebrew on OS X by default - # so set our flags to use that + # so set our flags to use homebrew openssl export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" -- cgit v1.2.3