summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-09-03 07:35:48 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-09-03 07:36:38 +0200
commitc164aa5bc74f44de070a33fd824677a931bc9574 (patch)
tree1fd1283e7be2d080d5613c5cfb3ca61333fb1e57
parent6797d0b7af61116dad96c8aae98633f258f57f72 (diff)
downloadmullvadvpn-c164aa5bc74f44de070a33fd824677a931bc9574.tar.xz
mullvadvpn-c164aa5bc74f44de070a33fd824677a931bc9574.zip
Don't build Rust on nightly for now
-rwxr-xr-xci/travis-rust-script.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/ci/travis-rust-script.sh b/ci/travis-rust-script.sh
index d447cd8ea1..6253b497ae 100755
--- a/ci/travis-rust-script.sh
+++ b/ci/travis-rust-script.sh
@@ -6,8 +6,13 @@ source env.sh ""
rustup update $RUST_TOOLCHAIN_CHANNEL
rustup default $RUST_TOOLCHAIN_CHANNEL
-cargo build --verbose
-cargo test --verbose
+# FIXME: Becaues of our old jsonrpc dependency our Rust code won't build
+# on latest nightly.
+if [ "${RUST_TOOLCHAIN_CHANNEL}" != "nightly" ]; then
+ cargo build --verbose
+ cargo test --verbose
+fi
+
if [ "${RUST_TOOLCHAIN_CHANNEL}" = "nightly" ]; then
rustup component add rustfmt-preview;
rustfmt --version;