diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2019-02-13 15:54:36 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-02-19 22:15:20 -0800 |
| commit | 05259303e4e8de2bf18ceac4884cd5e6a5065433 (patch) | |
| tree | 11126f3fe7a22a014d33aecd1e9ccd74607bfa54 /kokoro | |
| parent | a44643485522b1a78f6985b0bd6dc6ce32c2bd5a (diff) | |
| download | crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.tar crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.tar.gz crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.tar.bz2 crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.tar.lz crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.tar.xz crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.tar.zst crosvm-05259303e4e8de2bf18ceac4884cd5e6a5065433.zip | |
kokoro: use version specified in rust-toolchain
Update the default Rust toolchain to the version specified in the rust-toolchain file (which is part of the crosvm source directory, not baked into the Docker image) during each kokoro run. This will let us seamlessly update rust-toolchain without breaking the builds using the existing kokoro Docker image once this change is in place. BUG=None TEST=Build image with 1.31.0, then run test with rust-toolchain 1.32.0 Change-Id: If4f6dffc20af33011d2a96a0cf6b3db3582a2fd0 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1470914 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: David Tolnay <dtolnay@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kokoro/Dockerfile b/kokoro/Dockerfile index 43fa508..b3f42ef 100644 --- a/kokoro/Dockerfile +++ b/kokoro/Dockerfile @@ -124,7 +124,9 @@ RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THI ENV CARGO_TARGET_DIR=/build RUN mkdir -p $CARGO_TARGET_DIR WORKDIR /platform/crosvm -CMD cargo --version && rustc --version && rustfmt --version && \ +CMD rustup default "$(cat rust-toolchain)" && \ + rustup component add rustfmt-preview && \ + cargo --version && rustc --version && rustfmt --version && \ echo "Running cargo test" && \ cargo test --no-fail-fast --all-features --all --exclude aarch64 $TEST_FLAGS -- \ --test-threads=1 $TEST_RUNNER_FLAGS && \ |