diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-07-05 12:12:08 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-07-05 16:05:36 +0100 |
| commit | 41480c12406288dbe873826d6487b81e66a2cf98 (patch) | |
| tree | bcc420e38f8b6952fab06aa44b500b1078f43d3d | |
| parent | a6d7439bf093e9daf254740e247341b64158ca31 (diff) | |
| download | mullvadvpn-41480c12406288dbe873826d6487b81e66a2cf98.tar.xz mullvadvpn-41480c12406288dbe873826d6487b81e66a2cf98.zip | |
Improve .travis.yml
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 73b3d216ac..965f49d16f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,13 +55,12 @@ matrix: packages: - binutils cache: cargo - env: + env: &rust_linux_env - OPENSSL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" - OPENSSL_INCLUDE_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux/include" before_script: &rust_before_script - env script: - - echo "LD VERSION -> $(ld --version)" - cargo build --verbose - cargo test --verbose # Install and run rustfmt on nightly only until rustfmt.toml settings are stabilized. @@ -72,26 +71,20 @@ matrix: - language: rust rust: beta os: linux - cache: cargo - env: - - OPENSSL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" - - OPENSSL_INCLUDE_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux/include" addons: *rust_linux_addons + cache: cargo + env: *rust_linux_env before_script: *rust_before_script - script: &rust_linux_script - - cargo build --verbose - - cargo test --verbose + script: *rust_script - language: rust rust: stable os: linux - cache: cargo - env: - - OPENSSL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" - - OPENSSL_INCLUDE_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux/include" addons: *rust_linux_addons + cache: cargo + env: *rust_linux_env before_script: *rust_before_script - script: *rust_linux_script + script: *rust_script notifications: |