diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-05-04 18:53:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 18:53:05 -0400 |
| commit | 364049ee5f7a53fca8a3b442e7222aa1d0e79274 (patch) | |
| tree | 574a5ab1d8360e38569f97c6185596685bcf3312 | |
| parent | 1ff2606c90c0b0ce10912f03f01314e209b54574 (diff) | |
chore: update travis a bit for msrv
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tests/arg_tests.rs | 11 | ||||
| -rw-r--r-- | tests/invalid_config_tests.rs | 11 |
3 files changed, 8 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml index 3600a15b..83a234f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: rust rust: - # MSRV + # MSRV; though I only want to test if it builds. - 1.40.0 - stable - beta @@ -31,7 +31,10 @@ before_script: script: - cargo clippy -- -D clippy::all - cargo build --verbose --target $TARGET - - cargo test --verbose --target $TARGET + - | + if [[ $TRAVIS_RUST_VERSION != "1.40.0" ]]; then + cargo test --verbose --target $TARGET; + fi # Need to cache the whole `.cargo` directory to keep .crates.toml for cargo-update to work cache: @@ -81,14 +84,13 @@ before_deploy: deploy: provider: releases overwrite: true - api_key: + token: secure: ppBn0DnqZ+Rzb84doZQxYdUBQ0rVrZNIiH6ZSFEiCVJd0ttqXfOjK/qXbIf/zabwO0Olqz18jwd9piHjNigWRrHwX9N+YH0DZTM3f4WS2/2acvOP3AjSw6oERjYTwS5yKe/XP1sU11uL6O0oAxYFeiAkn7QOM7flVUE2BmmLAs2lLtQ+9ylmUeBGatrkTfQ0Z2i1o7p5mtI2fKUozpImtHq8TClQEsF4oQS5nvkHtpLuPQ0UrJ8vKZijDBeMuLbDkR121ujRnjoBt8+eXBRbwzAvVotwRozyol8noAN3i4VvYueId6oX7Y2DSEp26wnCuRXGurUnyya5JE55AKoevK+SUHRe5+29/2lPbC5d/etZt2tSX1AIJk9fHeIfRPSTzanIIyDpUzSGoMKjl1ARKGrgHYehRxMKpW0cC2xHSlQ+NrA5apLpXKr2IzpkGsxpAxLqRASbX2VJYCEL70WoJfXinZrxeDxXsaWBLGaj9ySyk059GZBMz9GBdYNtwF3G/3aSIt0nkEGgKipgYXHi5keKKGmyfeZyYkRJRbc369JRZiHuOWct+1ZsOdrKKdbyAdcDGj5kbKuYwA6E+wgI62IWvUTm+vtKDuIbLpu/48aOUuEslGHkYAszLTapX/Le9c9XTu3L+PMgkPq2LSyaeGrfnM+DE/Hwe3Jvurccp94= file_glob: true file: - bottom_*.tar.gz - bottom_*.zip - bottom_*.deb - skip_cleanup: true on: tags: true condition: "$TRAVIS_RUST_VERSION = stable" diff --git a/tests/arg_tests.rs b/tests/arg_tests.rs index c586a798..134d9615 100644 --- a/tests/arg_tests.rs +++ b/tests/arg_tests.rs @@ -7,16 +7,7 @@ use std::process::Command; //======================RATES======================// fn get_binary_location() -> String { - // env!("CARGO_BIN_EXE_btm").to_string() - if cfg!(target_os = "linux") { - "./target/x86_64-unknown-linux-gnu/debug/btm".to_string() - } else if cfg!(target_os = "windows") { - "./target/x86_64-pc-windows-msvc/debug/btm".to_string() - } else if cfg!(target_os = "macos") { - "./target/x86_64-apple-darwin/debug/btm".to_string() - } else { - "".to_string() - } + env!("CARGO_BIN_EXE_btm").to_string() } #[test] diff --git a/tests/invalid_config_tests.rs b/tests/invalid_config_tests.rs index 0a0f69a4..34b8e06e 100644 --- a/tests/invalid_config_tests.rs +++ b/tests/invalid_config_tests.rs @@ -5,16 +5,7 @@ use std::process::Command; // These tests are for testing some config file-specific options. fn get_binary_location() -> String { - // env!("CARGO_BIN_EXE_btm").to_string() - if cfg!(target_os = "linux") { - "./target/x86_64-unknown-linux-gnu/debug/btm".to_string() - } else if cfg!(target_os = "windows") { - "./target/x86_64-pc-windows-msvc/debug/btm".to_string() - } else if cfg!(target_os = "macos") { - "./target/x86_64-apple-darwin/debug/btm".to_string() - } else { - "".to_string() - } + env!("CARGO_BIN_EXE_btm").to_string() } #[test] |