From a08e40bf8130ebf215ca4b0724410bd0c964bc41 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 29 Jul 2019 10:30:20 -0700 Subject: [PATCH] rust-toolchain: upgrade to Rust 1.36.0 Update the rust-toolchain file and Docker image used in kokoro to match the Chrome OS toolchain. BUG=None TEST=docker/wrapped_smoke_test.sh Change-Id: I95cbf9bcaadd49b8476f2829bc75958dbea304e3 Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1724850 Tested-by: kokoro Reviewed-by: Zach Reizner --- docker/Dockerfile | 2 +- rust-toolchain | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index dea2fc4132..7d4d915ff4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.35.0 \ + RUST_VERSION=1.36.0 \ RUSTFLAGS='--cfg hermetic' # Debian usually has an old rust version in the repository. Instead of using that, we use rustup to diff --git a/rust-toolchain b/rust-toolchain index 2aeaa11ee2..39fc130ef8 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.35.0 +1.36.0