diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-07-01 16:01:36 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-07-01 16:14:27 +0200 |
| commit | a8fa0b0b0108fafbf27c5ed203d264f9997cfb8a (patch) | |
| tree | 03e221e9943fd5d64ead16bf95521f7fbc45a3d3 | |
| parent | 8bd20a1945533e9a35dc81036d6b6a56b1b33c58 (diff) | |
| download | mullvadvpn-a8fa0b0b0108fafbf27c5ed203d264f9997cfb8a.tar.xz mullvadvpn-a8fa0b0b0108fafbf27c5ed203d264f9997cfb8a.zip | |
Use script in ci/ dir on Travis macOS build as well
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rwxr-xr-x | ci/travis-rust-script.sh (renamed from ci/rust-linux-script.sh) | 0 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index c6ae998b4c..4c2f9a74d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,12 +59,9 @@ matrix: rust: stable os: osx before_script: - - source env.sh - - export RUSTFLAGS="--deny unused_imports --deny dead_code" - env script: - - cargo build --verbose - - cargo test --verbose + - ./ci/travis-rust-script.sh stable # Daemon - Linux - os: linux @@ -76,7 +73,7 @@ matrix: - docker run -d --name mvd-build -v $(pwd):/travis -w /travis mullvadvpn/mullvadvpn-app-build:latest tail -f /dev/null - docker ps script: - - docker exec -t mvd-build bash ci/rust-linux-script.sh nightly + - docker exec -t mvd-build bash ci/travis-rust-script.sh nightly - os: linux name: Daemon - beta Rust @@ -85,7 +82,7 @@ matrix: services: docker before_script: *rust_before_script script: - - docker exec -t mvd-build bash ci/rust-linux-script.sh beta + - docker exec -t mvd-build bash ci/travis-rust-script.sh beta - os: linux name: Daemon - stable Rust @@ -94,7 +91,7 @@ matrix: services: docker before_script: *rust_before_script script: - - docker exec -t mvd-build bash ci/rust-linux-script.sh stable + - docker exec -t mvd-build bash ci/travis-rust-script.sh stable notifications: diff --git a/ci/rust-linux-script.sh b/ci/travis-rust-script.sh index d447cd8ea1..d447cd8ea1 100755 --- a/ci/rust-linux-script.sh +++ b/ci/travis-rust-script.sh |