Merge branch 'rust-nightly'

BitBoxSwiss · Mar 25, 2020 · 0b15e7d · 0b15e7d
2 parents d33f1d2 + fa18067
commit 0b15e7d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.ci/travis-ci b/.ci/travis-ci
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:13
+CONTAINER=shiftcrypto/firmware_v2:14
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"

diff --git a/Dockerfile b/Dockerfile
@@ -132,9 +132,11 @@ ENV PATH /opt/lcov-1.14/bin:$PATH
 # Install rust compiler
 ENV PATH /opt/cargo/bin:$PATH
 ENV RUSTUP_HOME=/opt/rustup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain 1.42.0 -y
+COPY rust-toolchain /tmp/rust-toolchain
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain $(cat /tmp/rust-toolchain | tr -d '\r\n\t') -y
 RUN rustup target add thumbv7em-none-eabi
-RUN rustup component add rustfmt
+# re-enable and put into CI once available: https://rust-lang.github.io/rustup-components-history/index.html
+# RUN rustup component add rustfmt
 RUN rustup component add clippy
 RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.13.1
 RUN CARGO_HOME=/opt/cargo cargo install bindgen --version 0.53.2

diff --git a/rust-toolchain b/rust-toolchain
@@ -0,0 +1 @@
+nightly-2020-03-25