Commit c407530d authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #62 from vhbit/feature-matrix 

Feature matrix & conditioned doc generation
parents 93b725ea 87374ff2

.travis.yml

+11 −7
Original line number Diff line number Diff line
@@ -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)

Makefile

deleted100644 → 0
+0 −0

Empty file deleted.