diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-10-25 14:28:13 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-10-25 14:28:13 +0200 |
| commit | 7ae3777f63fe1f893767abed60afba93c8b1ff10 (patch) | |
| tree | 23f6eb3174d598968ecbcb467ac9e792e9e5956d /ci | |
| parent | 5900f4c4eb0e2d3521051f7ccbd3b0b96d492ddf (diff) | |
| download | mullvadvpn-7ae3777f63fe1f893767abed60afba93c8b1ff10.tar.xz mullvadvpn-7ae3777f63fe1f893767abed60afba93c8b1ff10.zip | |
Install Rust with {channel}-{target-triple} instead
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ci-rust-script.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index 62f33005da..1afeaefa8e 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -7,7 +7,6 @@ RUSTFLAGS="--deny unused_imports --deny dead_code" source env.sh "" -RUST_TARGET_ARG="" case "$(uname -s)" in Linux*|Darwin*) curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ @@ -16,14 +15,15 @@ case "$(uname -s)" in MINGW*|MSYS_NT*) curl -sSf -o rustup-init.exe https://win.rustup.rs/ ./rustup-init.exe -y --default-toolchain none --profile minimal --default-host x86_64-pc-windows-msvc - RUST_TARGET_ARG="--target x86_64-pc-windows-msvc" + # See https://github.com/rust-lang/rustup.rs/issues/2082 + RUST_TOOLCHAIN_CHANNEL="$RUST_TOOLCHAIN_CHANNEL-x86_64-pc-windows-msvc" ;; esac export PATH="$HOME/.cargo/bin/:$PATH" # Install the toolchain together with rustfmt. Here -c backtracks to last version where # the component was available. -time rustup toolchain install $RUST_TOOLCHAIN_CHANNEL --no-self-update -c rustfmt $RUST_TARGET_ARG +time rustup toolchain install $RUST_TOOLCHAIN_CHANNEL --no-self-update -c rustfmt case "$(uname -s)" in MINGW*|MSYS_NT*) @@ -35,8 +35,8 @@ esac # 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 $RUST_TARGET_ARG - time cargo test --locked --verbose $RUST_TARGET_ARG + time cargo build --locked --verbose + time cargo test --locked --verbose fi if [[ "${RUST_TOOLCHAIN_CHANNEL}" == "nightly" && "$(uname -s)" == "Linux" ]]; then |