diff options
| author | Steven Fackler <[email protected]> | 2016-07-31 15:55:32 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-07-31 15:55:32 -0700 |
| commit | 6f40b65d2c3e1a9414b2b79d5c49e4ba061f4811 (patch) | |
| tree | 2d279f68c5e3350d37498107090be21fe0fcaec1 | |
| parent | Fix catch_unwind feature and drop feature gate (diff) | |
| download | rust-openssl-6f40b65d2c3e1a9414b2b79d5c49e4ba061f4811.tar.xz rust-openssl-6f40b65d2c3e1a9414b2b79d5c49e4ba061f4811.zip | |
Build against 1.9
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | openssl/Cargo.toml | 3 | ||||
| -rwxr-xr-x | openssl/test/run.sh | 4 |
4 files changed, 2 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 91c6ad62..0d76be3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ addons: - gcc-arm-linux-gnueabihf rust: - nightly -- 1.8.0 +- 1.9.0 os: - osx - linux diff --git a/appveyor.yml b/appveyor.yml index f835d9f6..8cd9e32b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: install: - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2h.exe" - Win%BITS%OpenSSL-1_0_2h.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL" - - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.8.0-${env:TARGET}.exe" + - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.9.0-${env:TARGET}.exe" - rust-1.8.0-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - SET PATH=%PATH%;C:\MinGW\bin diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 218969eb..3d4b098c 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -26,9 +26,6 @@ rfc5114 = ["openssl-sys/rfc5114"] ecdh_auto = ["openssl-sys-extras/ecdh_auto"] pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"] -nightly = [] -catch_unwind = [] - [dependencies] bitflags = ">= 0.5.0, < 0.8.0" lazy_static = "0.2" diff --git a/openssl/test/run.sh b/openssl/test/run.sh index 85603773..cbd46cc6 100755 --- a/openssl/test/run.sh +++ b/openssl/test/run.sh @@ -7,10 +7,6 @@ if [ "$TEST_FEATURES" == "true" ]; then FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac" fi -if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then - FEATURES="$FEATURES nightly catch_unwind" -fi - if [ "$TRAVIS_OS_NAME" != "osx" ]; then export OPENSSL_LIB_DIR=$HOME/openssl/lib export OPENSSL_INCLUDE_DIR=$HOME/openssl/include |