diff options
| author | Steven Fackler <[email protected]> | 2014-10-10 11:39:40 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-10-10 11:39:40 -0400 |
| commit | c407530daeb0380edc22d45e6af7209911068607 (patch) | |
| tree | 040154767edb73138bb98f8635af3b105406f8cb | |
| parent | Merge pull request #78 from alexcrichton/update (diff) | |
| parent | Feature matrix & conditioned doc generation (diff) | |
| download | rust-openssl-rust-0.12.tar.xz rust-openssl-rust-0.12.zip | |
Merge pull request #62 from vhbit/feature-matrixrust-0.12
Feature matrix & conditioned doc generation
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | Makefile | 0 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b2b9dc69..ccab34c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,20 @@ language: rust env: global: - secure: qLvBJoJOJcPPZ+e31175O6sMUGBHgHe/kBuI0FCPeifYmpFyeRAkEvGddEkf8t3rojV+wE14CNYzzGsT/W/+JY7xW0C1FQKW3r+8SZ1Cave/8ahee0aCQVXGf0XY8c52uG6MrLGiUlNZbOsyFSdFUc/Io+kYZas4DxrinRSOIEA= + matrix: + - FEATURES="" + - FEATURES="tlsv1_1 tlsv1_2" os: - osx - linux before_script: - openssl s_server -accept 15418 -www -cert test/cert.pem -key test/key.pem >/dev/null 2>&1 & script: - - cargo build - - cargo test - - rustdoc src/lib.rs - - cargo build --features "sslv2" - - cargo build --features "tlsv1_1 tlsv1_2" -after_script: - - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh + - cargo build --features "$FEATURES" + - cargo test --features "$FEATURES" + - cargo doc --features "sslv2 tlsv1_1 tlsv1_2" +after_success: | + [ $TRAVIS_BRANCH = master ] && + [ $TRAVIS_PULL_REQUEST = false ] && + cd target/doc && + (curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh) diff --git a/Makefile b/Makefile deleted file mode 100644 index e69de29b..00000000 --- a/Makefile +++ /dev/null |