diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-03-05 13:14:19 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-03-05 13:14:19 +0100 |
| commit | 6bd6acc2f61f31a67f3dbd5091cf6cb287d6b78d (patch) | |
| tree | d3e6b3b7f2bfdabb8a4d6cd984c01d2d6f040eaa | |
| parent | 6484b788e1f80465275d727d39051ed1bf4bfbb5 (diff) | |
| parent | ecfbc9a0c3dd6faca9c3526c74b6eae898d16821 (diff) | |
| download | mullvadvpn-6bd6acc2f61f31a67f3dbd5091cf6cb287d6b78d.tar.xz mullvadvpn-6bd6acc2f61f31a67f3dbd5091cf6cb287d6b78d.zip | |
Merge branch 'dont-cache-travis'
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | env.sh | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index f2865d5b4d..025cd54b45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,16 +28,12 @@ matrix: - language: rust rust: stable os: osx - cache: cargo before_script: &rust_before_script - source env.sh - env - - du -sh target || true script: &rust_script - cargo build --verbose - cargo test --verbose - before_cache: &rust_before_cache - - rm -rf target/debug/incremental/ # Daemon - Linux - language: rust @@ -51,7 +47,6 @@ matrix: packages: - binutils - libdbus-1-dev - cache: cargo before_script: *rust_before_script script: - cargo build --verbose @@ -60,25 +55,20 @@ matrix: - rustup component add rustfmt-preview - cargo fmt --version || true - cargo fmt -- --check --unstable-features - before_cache: *rust_before_cache - language: rust rust: beta os: linux addons: *rust_linux_addons - cache: cargo before_script: *rust_before_script script: *rust_script - before_cache: *rust_before_cache - language: rust rust: stable os: linux addons: *rust_linux_addons - cache: cargo before_script: *rust_before_script script: *rust_script - before_cache: *rust_before_cache notifications: @@ -12,7 +12,7 @@ case "$(uname -s)" in export MACOSX_DEPLOYMENT_TARGET="10.7" PLATFORM="macos" ;; - MINGW*) + MINGW*|MSYS_NT*) PLATFORM="windows" ;; esac |