diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-01-31 13:57:36 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-02-06 10:12:53 +0100 |
| commit | 3646cb2fc12baaf29a8b94f03743eb8a0ee8b868 (patch) | |
| tree | 4abf6a104e98bf135809c5f318eb52f123fede49 | |
| parent | 4e09b0af3484639df9effe03e63663ed4fb70bd1 (diff) | |
| download | mullvadvpn-3646cb2fc12baaf29a8b94f03743eb8a0ee8b868.tar.xz mullvadvpn-3646cb2fc12baaf29a8b94f03743eb8a0ee8b868.zip | |
Simplify build scripts with --all
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | appveyor.yml | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index c3763c550f..ffc6f13c21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,14 +14,8 @@ before_script: script: - cargo build --verbose - - cargo test --verbose - - cargo fmt -- --write-mode=diff - - cd talpid_openvpn_plugin/ - - cargo test --verbose - - cargo fmt -- --write-mode=diff - - cd ../talpid_cli/ - - cargo test --verbose - - cargo fmt -- --write-mode=diff + - cargo test --all --verbose + - find src/ tests/ benches/ talpid_* -iname "*.rs" -print0 | xargs -0 -n1 rustfmt --write-mode=diff notifications: email: diff --git a/appveyor.yml b/appveyor.yml index d3af2daebb..2f340abacb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,15 +39,10 @@ install: # This is the "test phase", tweak it as you see fit test_script: - # we don't run the "test phase" when doing deploys - - if [%APPVEYOR_REPO_TAG%]==[false] ( - cargo build --target %TARGET% && echo "DEBUG BUILD DONE" && - cargo build --target %TARGET% --release && echo "RELEASE BUILD DONE" && - cargo test --target %TARGET% && echo "DEBUG TESTING DONE" && - cargo test --target %TARGET% --release && echo "RELEASE TESTING DONE" && - cd talpid_openvpn_plugin/ && cargo test --target %TARGET% - cd ../talpid_cli/ && cargo test --target %TARGET% - ) + - cargo build --target %TARGET% + - cargo build --target %TARGET% --release + - cargo test --all --target %TARGET% + - cargo test --all --target %TARGET% --release # Cache build binaries for faster builds next time cache: |