Skip to content

Commit b15ea24

Browse files
committed
Merge branch 'release/0.4.0'
2 parents bcc7601 + ba69cf0 commit b15ea24

26 files changed

+642
-462
lines changed

.travis.yml

+20-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Based on the "trust" template v0.1.1
2-
# https://github.com/japaric/trust/tree/v0.1.1
1+
# Based on the "trust" template v0.1.2
2+
# https://github.com/japaric/trust/tree/v0.1.2
33

44
dist: trusty
55
language: rust
@@ -10,6 +10,9 @@ env:
1010
global:
1111
- CRATE_NAME=autojump
1212

13+
rust:
14+
- nightly
15+
1316
matrix:
1417
include:
1518
# OSX
@@ -31,7 +34,6 @@ matrix:
3134
- env: TARGET=aarch64-unknown-linux-gnu
3235
- env: TARGET=arm-unknown-linux-gnueabi
3336
- env: TARGET=armv7-unknown-linux-gnueabihf
34-
- env: TARGET=i686-unknown-linux-gnu
3537
- env: TARGET=i686-unknown-linux-musl
3638
- env: TARGET=mips-unknown-linux-gnu
3739
- env: TARGET=mips64-unknown-linux-gnuabi64
@@ -41,18 +43,22 @@ matrix:
4143
- env: TARGET=powerpc64-unknown-linux-gnu
4244
- env: TARGET=powerpc64le-unknown-linux-gnu
4345
- env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
44-
- env: TARGET=x86_64-unknown-linux-gnu
4546
- env: TARGET=x86_64-unknown-linux-musl
4647

4748
# *BSD
4849
- env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
4950
- env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
5051
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
5152

52-
# netbsd currently doesn't build (because of nix-0.9.0)
53+
# the following configurations currently doesn't build (because of libc type mismatches)
5354
env: # important: https://docs.travis-ci.com/user/customizing-the-build/#rows-that-are-allowed-to-fail
5455
allow_failures:
55-
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
56+
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
57+
- env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
58+
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
59+
- env: TARGET=i686-linux-android DISABLE_TESTS=1
60+
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
61+
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
5662

5763
before_install:
5864
- set -e
@@ -72,12 +78,12 @@ before_deploy:
7278

7379
deploy:
7480
api_key:
75-
secure: NRazS54YDCGpBCyA7AOg0xDQTkz4n1VaE4NF7GpsqHFFL87JCgPD7ojt0k5sE7paIpZA5ABta2S0EgoGXBcxgNKRWCdtTqIvd+KKhweJl6qVgr2uKeXV3BUSpOCw4urrf2Tax/hTh+jK88XBSIy85Jnwm0vzExyANdiu/3n30nqMNCZw4D/hg6NQYBzPlbU0FOVz1i6OzSjBhJuF/raUX5XywuMNF6RuNzJeSEzbV3e0K6dOuAXMYGdue5QNlgodUiefeaZSY0MG43K+mwZJYe013C2XwGaubrePKR2RMTxcnIGVsQH4Mgh8PTWymZUke/J2MXs/gSzocQp6ATcZHVk3gtgkOoO2YhONanByZZrfTCNmXKxdrOqM+oeC4L1FuOmHlVDLKhdCH5gOvSo4215la7AdpmY/+IzbK33jIQQdDMV8S1ChpZTitOTtiV533oo+zcT3yhI3TgLz09Uga0kuEqMGM512oQkjCgDrANDfBX3GR/PMrgr64+zIqPzq0HKksXnMgtgCeD44Lkfk0bBxA6+lIFJLLWIuPU1SHsSQ6KWRDJBXFvelajszNU/b31oHYf3mtz/of+vuKv/iL8t0XkMSQjdN9GCNNVV2aHejOudCKjCCoAawyJ7Z22rrNugu4+r7Wxhf7syTOpAv3shzjtIP/liUG6Snq3PGGBg=
81+
secure: G3d3zoQ5NA+fLIXOMxL1TuYZIN76yiEQQ6AEyQwV9YNKvDCuqDy+Ls6c2RqSdDBOe+jdqMO8kCQGhgj4u+YIx8zlkzO5WjepQk9a/4VeAHGRsLuCvvTq1J9zqDxw7s6klZBvDJM9EJboviIguDJQn+5/jwGqYczw1Qq6JzXpo5AfTg5O9UcDIRgZlt4LXpHgNvM4tIFD6RnFoeCxzIPloNoKDnqB3Ebxcf1vD/xhXQZR9zlFE7Zq0nmmY2C+nvwVfEzvBaKdiSrk2ZDfw1jhPdQTHcIOwmUUSfhRIOjQvmVtSojDy+p8wZ2O0Tvopuj//XrL3kGo9tDdeFpht4atF92OesYit5ZoutCJZgcoOQHr/yKt0lVcCqYihh7voeWZ4fDUXXbwI4jpn6uXE6P60s5u9KV64XkwQJanZoz/Pn3KAZRzvmtbjQbS7xQ4gaU1on0KJW4ETesMta4sCKDT8VCt8umZGHJOvneCFChOdsuVy+oUXHmpIiijVwprm+pgN/IQgrVWX9uVNTksU4pJ9XpcJudjQ+2aVXRzeuTuEuP6EArcc12DMsoaTbvjEyVy5jLcW4XBF5vMKvNZ9ydUQEAGBEkSeyR1QR5MpsBCZEz49EY8dqPzPwzbkoU3nh+rPKSD9FxQL+IRlqw6m7oP9worzbpW081vVzLBiTscmOg=
7682

7783
file_glob: true
7884
file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
7985
on:
80-
condition: $TRAVIS_RUST_VERSION = stable
86+
condition: $TRAVIS_RUST_VERSION = nightly
8187
tags: true
8288
provider: releases
8389
skip_cleanup: true
@@ -87,6 +93,12 @@ before_cache:
8793
# Travis can't cache files that are not readable by "others"
8894
- chmod -R a+r $HOME/.cargo
8995

96+
branches:
97+
only:
98+
# release tags
99+
- /^\d+\.\d+\.\d+.*$/
100+
- master
101+
90102
notifications:
91103
email:
92104
on_success: never

0 commit comments

Comments
 (0)