Skip to content

Commit

Permalink
Use globally installed libsodium and openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
zonyitoo committed Mar 28, 2020
1 parent 3c2bdd2 commit 7fcc952
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,26 @@ jobs:

- os: osx
rust: stable
osx_image: xcode11.3
env: SODIUM_USE_PKG_CONFIG=1

- os: linux
rust: stable
dist: bionic
env: SODIUM_USE_PKG_CONFIG=1
- os: linux
rust: beta
dist: bionic
env: SODIUM_USE_PKG_CONFIG=1
- os: linux
rust: nightly
dist: bionic
env: SODIUM_USE_PKG_CONFIG=1

allow_failures:
# FIXME: Travis build success but tests crash
- os: osx
- os: windows
rust: stable

env:
- RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" RUSTDOCFLAGS="-Ctarget-feature=+aes,+ssse3" RUST_BACKTRACE=1
Expand All @@ -27,15 +35,24 @@ addons:
apt:
packages:
- libssl-dev
- libsodium-dev
homebrew:
packages:
- libsodium

install:
# Install OpenSSL on Windows
# - if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
# curl -Lo "openssl-1.0.2c-win64-mingw.zip" "https://dl.bintray.com/vszakats/generic/openssl-1.0.2c-win64-mingw.zip";
# unzip "openssl-1.0.2c-win64-mingw.zip" -d "/c/OpenSSL";
# export OPENSSL_LIB_DIR=/c/OpenSSL/openssl-1.0.2c-win64-mingw;
# export OPENSSL_INCLUDE_DIR=/c/OpenSSL/openssl-1.0.2c-win64-mingw/include;
# export OPENSSL_DIR=/c/OpenSSL/openssl-1.0.2c-win64-mingw;
# fi
- if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
curl -Lo "openssl-1.0.2c-win64-mingw.zip" "https://dl.bintray.com/vszakats/generic/openssl-1.0.2c-win64-mingw.zip";
unzip "openssl-1.0.2c-win64-mingw.zip" -d "/c/OpenSSL";
export OPENSSL_LIB_DIR=/c/OpenSSL/openssl-1.0.2c-win64-mingw;
export OPENSSL_INCLUDE_DIR=/c/OpenSSL/openssl-1.0.2c-win64-mingw/include;
export OPENSSL_DIR=/c/OpenSSL/openssl-1.0.2c-win64-mingw;
choco install openssl;
export OPENSSL_DIR='/c/Program Files/OpenSSL-Win64/';
export OPENSSL_STATIC=1;
fi

script:
Expand Down

0 comments on commit 7fcc952

Please sign in to comment.