Skip to content

Commit 1887d71

Browse files
committed
chore: update to trust-0.1.2 and fix deploy key
1 parent c5f30ff commit 1887d71

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed

.travis.yml

Lines changed: 10 additions & 4 deletions
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
@@ -70,12 +70,12 @@ before_deploy:
7070

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

7575
file_glob: true
7676
file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
7777
on:
78-
condition: $TRAVIS_RUST_VERSION = stable
78+
condition: $TRAVIS_RUST_VERSION = nightly
7979
tags: true
8080
provider: releases
8181
skip_cleanup: true
@@ -85,6 +85,12 @@ before_cache:
8585
# Travis can't cache files that are not readable by "others"
8686
- chmod -R a+r $HOME/.cargo
8787

88+
branches:
89+
only:
90+
# release tags
91+
- /^\d+\.\d+\.\d+.*$/
92+
- master
93+
8894
notifications:
8995
email:
9096
on_success: never

appveyor.yml

Lines changed: 18 additions & 6 deletions
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
environment:
55
global:
@@ -8,7 +8,9 @@ environment:
88

99
matrix:
1010
- TARGET: i686-pc-windows-msvc
11+
RUST_VERSION: nightly
1112
- TARGET: x86_64-pc-windows-msvc
13+
RUST_VERSION: nightly
1214

1315
install:
1416
- ps: >-
@@ -26,18 +28,22 @@ install:
2628
test_script:
2729
# we don't run the "test phase" when doing deploys
2830
- if [%APPVEYOR_REPO_TAG%]==[false] (
29-
cargo build --features nightly --target %TARGET% &&
30-
cargo test --target %TARGET%
31+
cargo build --target %TARGET% &&
32+
cargo build --target %TARGET% --release &&
33+
cargo test --target %TARGET% &&
34+
cargo test --target %TARGET% --release &&
35+
cargo run --target %TARGET% &&
36+
cargo run --target %TARGET% --release
3137
)
3238

3339
before_deploy:
34-
- cargo rustc --features nightly --target %TARGET% --release --bin autojump -- -C lto
40+
- cargo rustc --target %TARGET% --release --bin autojump -- -C lto
3541
- ps: ci\before_deploy.ps1
3642

3743
deploy:
3844
artifact: /.*\.zip/
3945
auth_token:
40-
secure: wstWtOl7e6TUnwU5KKd84jDXBflG4UHQJlrpQmvHqiMvRhJlX019zac+TD0itTu4
46+
secure: GcA+5ic3SEqiNovkdYNOct5D/AGTS2LTp6jZuDgHAVUC3/oEHGM5U8JTQAc0o/0M
4147
description: ''
4248
on:
4349
RUST_VERSION: nightly
@@ -48,6 +54,12 @@ cache:
4854
- C:\Users\appveyor\.cargo\registry
4955
- target
5056

57+
branches:
58+
only:
59+
# Release tags
60+
- /^\d+\.\d+\.\d+.*$/
61+
- master
62+
5163
notifications:
5264
- provider: Email
5365
on_build_success: false

ci/before_deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ main() {
1717

1818
test -f Cargo.lock || cargo generate-lockfile
1919

20-
cross rustc --features nightly --bin autojump --target $TARGET --release -- -C lto
20+
cross rustc --bin autojump --target $TARGET --release -- -C lto
2121

2222
cp target/$TARGET/release/autojump $stage/
2323

ci/script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
set -ex
44

55
main() {
6-
cross build --features nightly --target $TARGET
6+
cross build --target $TARGET
77

88
if [ ! -z $DISABLE_TESTS ]; then
99
return
1010
fi
1111

12-
cross test --features nightly --target $TARGET
12+
cross test --target $TARGET
1313
}
1414

1515
# we don't run the "test phase" when doing deploys

0 commit comments

Comments
 (0)