diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-08-26 14:51:13 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-08-26 17:40:41 +0200 |
| commit | 8cd562a38eabab7688553f0e71dc97aa7f73fc33 (patch) | |
| tree | 16a755297d25bb5926b7fcd3b4ad91a8a5752c4a | |
| parent | 6a049d1ed322fa1bb15a7ede85ec6d8ef5cb1498 (diff) | |
| download | mullvadvpn-8cd562a38eabab7688553f0e71dc97aa7f73fc33.tar.xz mullvadvpn-8cd562a38eabab7688553f0e71dc97aa7f73fc33.zip | |
Build all Rust code on nighly, since the blocker is gone
The jsonrpc stuff is finally gone.
| -rwxr-xr-x | ci/ci-rust-script.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index f3417da8db..2d53fc3d65 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -36,12 +36,8 @@ esac # On Windows, it relies on having msbuild.exe in your path. ./wireguard/build-wireguard-go.sh -# FIXME: Becaues of our old jsonrpc dependency our Rust code won't build -# on latest nightly. -if [ "${RUST_TOOLCHAIN_CHANNEL}" != "nightly" ]; then - time cargo build --locked --verbose - time cargo test --locked --verbose -fi +time cargo build --locked --verbose +time cargo test --locked --verbose if [[ "${RUST_TOOLCHAIN_CHANNEL}" == "nightly" && "$(uname -s)" == "Linux" ]]; then rustfmt --version; |