Merge branch 'master' into develop

This commit is contained in:
Isis Lovecruft 2017-05-15 05:02:08 +00:00
commit 95758e5a86
Failed to extract signature
2 changed files with 18 additions and 12 deletions

View file

@ -6,10 +6,11 @@ rust:
- nightly - nightly
env: env:
- TEST_COMMAND=test FEATURES='yolocrypto' - TEST_COMMAND=test FEATURES=--features="yolocrypto"
- TEST_COMMAND=test FEATURES='yolocrypto nightly' - TEST_COMMAND=test FEATURES=--features="yolocrypto nightly"
- TEST_COMMAND=bench FEATURES='yolocrypto bench' - TEST_COMMAND=bench FEATURES=--features="yolocrypto bench"
- TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' - TEST_COMMAND=bench FEATURES=--features="yolocrypto nightly bench"
- TEST_COMMAND=build FEATURES=--no-default-features
matrix: matrix:
exclude: exclude:
@ -18,18 +19,23 @@ matrix:
# run benchmarks, which causes dalek not to build on stable. See # run benchmarks, which causes dalek not to build on stable. See
# https://github.com/isislovecruft/curve25519-dalek/pull/38#issuecomment-286027562 # https://github.com/isislovecruft/curve25519-dalek/pull/38#issuecomment-286027562
- rust: stable - rust: stable
env: TEST_COMMAND=bench FEATURES='yolocrypto bench' env: TEST_COMMAND=bench FEATURES=--features="yolocrypto bench"
- rust: beta - rust: beta
env: TEST_COMMAND=bench FEATURES='yolocrypto bench' env: TEST_COMMAND=bench FEATURES=--features="yolocrypto bench"
- rust: stable - rust: stable
env: TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' env: TEST_COMMAND=bench FEATURES=--features="yolocrypto nightly bench"
- rust: beta - rust: beta
env: TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' env: TEST_COMMAND=bench FEATURES=--features="yolocrypto nightly bench"
# Test nightly features, such as radix_51, only on nightly. # Test nightly features, such as radix_51, only on nightly.
- rust: stable - rust: stable
env: TEST_COMMAND=test FEATURES='yolocrypto nightly' env: TEST_COMMAND=test FEATURES=--features="yolocrypto nightly"
- rust: beta - rust: beta
env: TEST_COMMAND=test FEATURES='yolocrypto nightly' env: TEST_COMMAND=test FEATURES=--features="yolocrypto nightly"
# Test no_std only on nightly.
- rust: stable
env: TEST_COMMAND=build FEATURES=--no-default-features
- rust: beta
env: TEST_COMMAND=build FEATURES=--no-default-features
script: script:
- cargo $TEST_COMMAND --features="$FEATURES" - cargo $TEST_COMMAND $FEATURES

View file

@ -1,6 +1,6 @@
[package] [package]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "0.7.0" version = "0.7.1"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>", authors = ["Isis Lovecruft <isis@patternsinthevoid.net>",
"Henry de Valence <hdevalence@hdevalence.ca>"] "Henry de Valence <hdevalence@hdevalence.ca>"]
readme = "README.md" readme = "README.md"