From cd8875aa635935a8c82ef771dec3f72752625c03 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 23 Dec 2015 12:34:19 -0600 Subject: 0.9.8 experiment for travis --- .travis.yml | 31 +------------------------------ .travis/install.sh | 20 ++++++++++++++++++++ .travis/run.sh | 6 ++++++ 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb61d3eb..8abca060 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: python cache: directories: - $HOME/.cache/pip + - $HOME/ossl-098 matrix: include: @@ -22,44 +23,14 @@ matrix: env: TOXENV=pypy - python: 2.6 env: TOXENV=py26 OPENSSL=0.9.8 - addons: - apt: - sources: - - lucid - packages: - - libssl-dev/lucid - python: 2.7 env: TOXENV=py27 OPENSSL=0.9.8 - addons: - apt: - sources: - - lucid - packages: - - libssl-dev/lucid - python: 3.3 env: TOXENV=py33 OPENSSL=0.9.8 - addons: - apt: - sources: - - lucid - packages: - - libssl-dev/lucid - python: 3.4 env: TOXENV=py34 OPENSSL=0.9.8 - addons: - apt: - sources: - - lucid - packages: - - libssl-dev/lucid - python: 3.5 env: TOXENV=py35 OPENSSL=0.9.8 - addons: - apt: - sources: - - lucid - packages: - - libssl-dev/lucid - python: pypy env: TOXENV=pypy OPENSSL=0.9.8 addons: diff --git a/.travis/install.sh b/.travis/install.sh index 2003dbed..48b6055e 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -61,6 +61,26 @@ else pyenv install pypy-4.0.1 pyenv global pypy-4.0.1 fi + if [[ "${OPENSSL}" == "0.9.8" ]]; then + # download, compile, and install if it's not already present via travis cache + if [[ ! -f "$HOME/ossl-098/bin/openssl" ]]; then + curl -O https://www.openssl.org/source/openssl-0.9.8zh.tar.gz + tar zxvf openssl-0.9.8zh.tar.gz + cd openssl-0.9.8zh + echo "OPENSSL_0.9.8ZH_CUSTOM { + global: + *; + };" > openssl.ld + ./config no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 + make depend + make install + tree $HOME/ossl-098 + fi + export PATH="$HOME/ossl-098/bin:$PATH" + export CFLAGS="-I$HOME/ossl-098/include" + export LDFLAGS="-L$HOME/ossl-098/lib" + export LD_LIBRARY_PATH="$HOME/ossl-098/lib" + fi pip install virtualenv fi diff --git a/.travis/run.sh b/.travis/run.sh index 178dfc20..e0fb24e6 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -23,6 +23,12 @@ else PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" fi + if [[ "${OPENSSL}" == "0.9.8" ]]; then + export PATH="$HOME/ossl-098/bin:$PATH" + export CFLAGS="-I$HOME/ossl-098/include" + export LDFLAGS="-L$HOME/ossl-098/lib" + export LD_LIBRARY_PATH="$HOME/ossl-098/lib" + fi fi source ~/.venv/bin/activate tox -- $TOX_FLAGS -- cgit v1.2.3 From d864e77f2da144d89a4c7d8138b06524707c6ad3 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 23 Dec 2015 12:47:15 -0600 Subject: tree isn't available --- .travis/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 48b6055e..59f9769a 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -74,7 +74,6 @@ else ./config no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 make depend make install - tree $HOME/ossl-098 fi export PATH="$HOME/ossl-098/bin:$PATH" export CFLAGS="-I$HOME/ossl-098/include" -- cgit v1.2.3 From 5dc50c05edb3e2a470112784be379b99623c938c Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 23 Dec 2015 16:13:24 -0600 Subject: make this 0.9.8l and cry --- .travis/install.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 59f9769a..9c34d60b 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -63,15 +63,18 @@ else fi if [[ "${OPENSSL}" == "0.9.8" ]]; then # download, compile, and install if it's not already present via travis cache + # This is 0.9.8l rather than zh because we have some branches for handling + # < 0.9.8m that won't be exercised with a newer OpenSSL. (RHEL5 is 0.9.8e with + # patches, but while that's in jenkins we don't get coverage data from it) if [[ ! -f "$HOME/ossl-098/bin/openssl" ]]; then - curl -O https://www.openssl.org/source/openssl-0.9.8zh.tar.gz - tar zxvf openssl-0.9.8zh.tar.gz - cd openssl-0.9.8zh - echo "OPENSSL_0.9.8ZH_CUSTOM { + curl -O https://www.openssl.org/source/openssl-0.9.8l.tar.gz + tar zxvf openssl-0.9.8l.tar.gz + cd openssl-0.9.8l + echo "OPENSSL_0.9.8L_CUSTOM { global: *; };" > openssl.ld - ./config no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 + ./config no-asm no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 make depend make install fi -- cgit v1.2.3 From 331b496506efffff7ed811b4dcaec4611989fae2 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 2 Jan 2016 10:31:04 -0600 Subject: rename 098 directory in CI to 098l --- .travis.yml | 2 +- .travis/install.sh | 12 ++++++------ .travis/run.sh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8abca060..4ded04d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: python cache: directories: - $HOME/.cache/pip - - $HOME/ossl-098 + - $HOME/ossl-098l matrix: include: diff --git a/.travis/install.sh b/.travis/install.sh index 9c34d60b..e8525860 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -66,7 +66,7 @@ else # This is 0.9.8l rather than zh because we have some branches for handling # < 0.9.8m that won't be exercised with a newer OpenSSL. (RHEL5 is 0.9.8e with # patches, but while that's in jenkins we don't get coverage data from it) - if [[ ! -f "$HOME/ossl-098/bin/openssl" ]]; then + if [[ ! -f "$HOME/ossl-098l/bin/openssl" ]]; then curl -O https://www.openssl.org/source/openssl-0.9.8l.tar.gz tar zxvf openssl-0.9.8l.tar.gz cd openssl-0.9.8l @@ -74,14 +74,14 @@ else global: *; };" > openssl.ld - ./config no-asm no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 + ./config no-asm no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098l make depend make install fi - export PATH="$HOME/ossl-098/bin:$PATH" - export CFLAGS="-I$HOME/ossl-098/include" - export LDFLAGS="-L$HOME/ossl-098/lib" - export LD_LIBRARY_PATH="$HOME/ossl-098/lib" + export PATH="$HOME/ossl-098l/bin:$PATH" + export CFLAGS="-I$HOME/ossl-098l/include" + export LDFLAGS="-L$HOME/ossl-098l/lib" + export LD_LIBRARY_PATH="$HOME/ossl-098l/lib" fi pip install virtualenv fi diff --git a/.travis/run.sh b/.travis/run.sh index e0fb24e6..23b9e89e 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -24,10 +24,10 @@ else eval "$(pyenv init -)" fi if [[ "${OPENSSL}" == "0.9.8" ]]; then - export PATH="$HOME/ossl-098/bin:$PATH" - export CFLAGS="-I$HOME/ossl-098/include" - export LDFLAGS="-L$HOME/ossl-098/lib" - export LD_LIBRARY_PATH="$HOME/ossl-098/lib" + export PATH="$HOME/ossl-098l/bin:$PATH" + export CFLAGS="-I$HOME/ossl-098l/include" + export LDFLAGS="-L$HOME/ossl-098l/lib" + export LD_LIBRARY_PATH="$HOME/ossl-098l/lib" fi fi source ~/.venv/bin/activate -- cgit v1.2.3 From 80b1281752b99f063ea28c1b4a08ca85db45d7aa Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 2 Jan 2016 13:47:41 -0600 Subject: be less verbose when untarring --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index e8525860..0e5cdb48 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -68,7 +68,7 @@ else # patches, but while that's in jenkins we don't get coverage data from it) if [[ ! -f "$HOME/ossl-098l/bin/openssl" ]]; then curl -O https://www.openssl.org/source/openssl-0.9.8l.tar.gz - tar zxvf openssl-0.9.8l.tar.gz + tar zxf openssl-0.9.8l.tar.gz cd openssl-0.9.8l echo "OPENSSL_0.9.8L_CUSTOM { global: -- cgit v1.2.3