diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-01-12 09:13:36 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-01-12 09:13:36 +0100 |
| commit | 3da799eda3954d7629f65a92803c72f1c55b0a0e (patch) | |
| tree | 663d01c34e97cbc684bbd6928c3003867ea033d8 | |
| parent | c3a3e7a392de406175e9d83046e12817cbb780f6 (diff) | |
| parent | 72da052ad37f91e9a5c6b520561526277439ea3a (diff) | |
| download | mullvadvpn-3da799eda3954d7629f65a92803c72f1c55b0a0e.tar.xz mullvadvpn-3da799eda3954d7629f65a92803c72f1c55b0a0e.zip | |
Merge branch 'only-build-stable-on-mac-on-travis'
| -rw-r--r-- | .travis.yml | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 2246706168..8e3f2e26e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ matrix: # Backend macOS - language: rust - rust: nightly + rust: stable os: osx cache: cargo @@ -48,35 +48,19 @@ matrix: script: &rust_script - cargo build --verbose - cargo test --verbose - # Format only on nightly, since that is where rustfmt-nightly compiles - - if [ "${TRAVIS_RUST_VERSION}" = "nightly" ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH - && ./format.sh --write-mode=diff; - else - echo "Not checking formatting on this build"; - fi - - - language: rust - rust: stable - os: osx - cache: cargo - before_script: *rust_before_script - script: *rust_script - - - language: rust - rust: beta - os: osx - cache: cargo - before_script: *rust_before_script - script: *rust_script # Backend Linux - language: rust - rust: stable + rust: nightly os: linux cache: cargo before_script: *rust_before_script - script: *rust_script + script: + - cargo build --verbose + - cargo test --verbose + # Format only on nightly, since that is where rustfmt-nightly compiles + - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH + - ./format.sh --write-mode=diff; - language: rust rust: beta @@ -86,7 +70,7 @@ matrix: script: *rust_script - language: rust - rust: nightly + rust: stable os: linux cache: cargo before_script: *rust_before_script |