diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-09-26 10:16:01 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-09-26 09:16:01 -0500 |
| commit | 32509aef1fc336a25aad094aad7573fc1d736574 (patch) | |
| tree | 0c90271a503889ffc423ee17481e9b301ce4d495 | |
| parent | f99407e99f55219d1714ecbb34fa7af03d7d3064 (diff) | |
| download | cryptography-32509aef1fc336a25aad094aad7573fc1d736574.tar.gz cryptography-32509aef1fc336a25aad094aad7573fc1d736574.tar.bz2 cryptography-32509aef1fc336a25aad094aad7573fc1d736574.zip | |
Simplify OpenSSL bits in travis (#3172)
* Simplify OpenSSL bits in travis
* more simplify
* missed one
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rwxr-xr-x | .travis/install.sh | 17 | ||||
| -rwxr-xr-x | .travis/run.sh | 9 |
3 files changed, 12 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index c7e71b39..8aa2b974 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ language: python cache: directories: - $HOME/.cache/pip - - $HOME/ossl-100t - - $HOME/ossl-110a + - $HOME/ossl/ matrix: include: @@ -27,13 +26,13 @@ matrix: - python: pypy env: TOXENV=pypy PYPY_VERSION=5.4.1 - python: 2.7 - env: TOXENV=py27 OPENSSL=1.0.0 + env: TOXENV=py27 OPENSSL=1.0.0t - python: 3.5 - env: TOXENV=py35 OPENSSL=1.0.0 + env: TOXENV=py35 OPENSSL=1.0.0t - python: 2.7 - env: TOXENV=py27 OPENSSL=1.1.0 + env: TOXENV=py27 OPENSSL=1.1.0a - python: 3.5 - env: TOXENV=py35 OPENSSL=1.1.0 + env: TOXENV=py35 OPENSSL=1.1.0a - python: 2.7 env: TOXENV=docs addons: diff --git a/.travis/install.sh b/.travis/install.sh index ecacc147..d3a7358a 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -60,21 +60,14 @@ else pyenv global "pypy-$PYPY_VERSION" fi - if [[ "${OPENSSL}" == "1.0.0" ]]; then - OPENSSL_VERSION_NUMBER="1.0.0t" - OPENSSL_DIR="ossl-100t" - fi - if [[ "${OPENSSL}" == "1.1.0" ]]; then - OPENSSL_VERSION_NUMBER="1.1.0a" - OPENSSL_DIR="ossl-110a" - fi # download, compile, and install if it's not already present via travis # cache - if [ -n "$OPENSSL_DIR" ]; then + if [ -n "${OPENSSL}" ]; then + OPENSSL_DIR="ossl/${OPENSSL}" if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then - curl -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION_NUMBER.tar.gz - tar zxf openssl-$OPENSSL_VERSION_NUMBER.tar.gz - cd openssl-$OPENSSL_VERSION_NUMBER + curl -O https://www.openssl.org/source/openssl-$OPENSSL.tar.gz + tar zxf openssl-$OPENSSL.tar.gz + cd openssl-$OPENSSL ./config shared no-asm no-ssl2 -fPIC --prefix="$HOME/$OPENSSL_DIR" # modify the shlib version to a unique one to make sure the dynamic # linker doesn't load the system one. This isn't required for 1.1.0 at the diff --git a/.travis/run.sh b/.travis/run.sh index 8dd3a0c7..34a9cb54 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -26,14 +26,9 @@ else PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" fi - if [[ "${OPENSSL}" == "1.0.0" ]]; then - OPENSSL_DIR="ossl-100t" - fi - if [[ "${OPENSSL}" == "1.1.0" ]]; then - OPENSSL_DIR="ossl-110a" - fi + if [ -n "${OPENSSL}" ]; then + OPENSSL_DIR="ossl/${OPENSSL}" - if [ -n "$OPENSSL_DIR" ]; then export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" export CFLAGS="-I$HOME/$OPENSSL_DIR/include" # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH |