Skip to content

Commit

Permalink
Resolve several travis-ci issues
Browse files Browse the repository at this point in the history
MBEDTLS_VERSION, OPENSSL_VERSION were defined twice - in both
.travis.yml  and .travis/build-deps.sh files, the last one
defined OPENSSL_VERSION via nonexistent OPENSSL_VERION
variable, which lead us to use openssl-1.0.1 instead of
openssl-1.0.2, I removed variable definition from build-deps.sh

"cache: [ apt: true ]" is not a travis supported option, it was
introduced by mistake, I removed it

LD_LIBRARY_PATH was defined for the entire test run, it includes
custom openssl build, which was picked by "wget", so "wget"
could not verify SSL cert at https://www.openssl.org sometimes.
We do not want wget to pick our custom LD_LIBRARY_PATH, so I moved
that variable to "script" section

LD_LIBRARY_PATH was defined for both linux and osx environments,
for the second DYLD_LIBRARY_PATH must be defined instead

v2: Upgrade openssl, mbedtls to the most recent versions
v3: DYLD_LIBRARY_PATH was defined via LD_LIBRARY_PATH by mistake

Acked-by: Selva Nair <selva.nair@gmail.com>
Message-Id: <1485673091-7600-1-git-send-email-chipitsine@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13983.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
  • Loading branch information
chipitsine authored and dsommers committed Jan 29, 2017
1 parent 631812f commit 208c03e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ env:
global:
- JOBS=3
- PREFIX="${HOME}/opt"
- MBEDTLS_VERSION="2.2.1"
- MBEDTLS_VERSION="2.4.0"
- MBEDTLS_CFLAGS="-I${PREFIX}/include"
- MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
- OPENSSL_VERSION="1.0.1t"
- OPENSSL_VERSION="1.0.2k"
- OPENSSL_CFLAGS="-I${PREFIX}/include"
- OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
- LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"

matrix:
include:
Expand Down Expand Up @@ -63,7 +62,6 @@ addons:
- linux-libc-dev

cache:
apt: true
ccache: true
directories:
- download-cache
Expand All @@ -77,6 +75,8 @@ install:
- .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)

script:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH}"; fi
- autoreconf -vi
- ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG} || (cat config.log && exit 1)
- make -j$JOBS
Expand Down
2 changes: 0 additions & 2 deletions .travis/build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
set -eux

# Set defaults
MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.2.1}"
OPENSSL_VERSION="${OPENSSL_VERION:-1.0.2h}"
PREFIX="${PREFIX:-${HOME}/opt}"

download_mbedtls () {
Expand Down

0 comments on commit 208c03e

Please sign in to comment.