diff options
| author | Michael Grunder <michael.grunder@gmail.com> | 2020-07-31 09:16:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 09:16:32 -0700 |
| commit | 04a27f4800fc53f1f0192284da47cf0ed5de5159 (patch) | |
| tree | a62b81f06628dfb5142645eff28d1a626ad321c4 | |
| parent | 8966a1fc2b21de85b0bf7573257cb2a104ea2130 (diff) | |
We can run SSL tests everywhere except mingw/Windows (#859)
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f9a9460..1e9b556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,11 @@ branches: - /^release\/.*$/ install: - - if [ "$BITS" == "64" ]; then + - if [ "$TRAVIS_COMPILER" != "mingw" ]; then wget https://github.com/redis/redis/archive/6.0.6.tar.gz; tar -xzvf 6.0.6.tar.gz; pushd redis-6.0.6 && BUILD_TLS=yes make && export PATH=$PWD/src:$PATH && popd; - fi + fi; before_script: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then @@ -33,8 +33,6 @@ before_script: addons: apt: - sources: - - sourceline: 'ppa:chris-lea/redis-server' packages: - libc6-dbg - libc6-dev @@ -46,17 +44,13 @@ addons: - libssl-dev - libssl-dev:i386 - valgrind - - redis env: - BITS="32" - BITS="64" script: - - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DENABLE_SSL:BOOL=ON"; - if [ "$BITS" == "64" ]; then - EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DENABLE_SSL_TESTS:BOOL=ON"; - fi; + - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DENABLE_SSL:BOOL=ON -DENABLE_SSL_TESTS:BOOL=ON"; if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$BITS" == "32" ]; then CFLAGS="-m32 -Werror"; |