diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | ci/docker/thumbv6m-none-eabi/Dockerfile | 4 | ||||
| -rw-r--r-- | ci/docker/thumbv7em-none-eabi/Dockerfile | 4 | ||||
| -rw-r--r-- | ci/docker/thumbv7em-none-eabihf/Dockerfile | 4 | ||||
| -rw-r--r-- | ci/docker/thumbv7m-none-eabi/Dockerfile | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 3337d3f..f0f52e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,11 @@ matrix: - env: TARGET=thumbv7em-none-eabihf env: TARGET=x86_64-unknown-linux-gnu +install: + - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION + - source ~/.cargo/env + - rustup component add rust-src + script: - cargo generate-lockfile - sh ci/run-docker.sh $TARGET diff --git a/ci/docker/thumbv6m-none-eabi/Dockerfile b/ci/docker/thumbv6m-none-eabi/Dockerfile index fa5439a..ee82ee6 100644 --- a/ci/docker/thumbv6m-none-eabi/Dockerfile +++ b/ci/docker/thumbv6m-none-eabi/Dockerfile @@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \ curl \ libcurl4-openssl-dev \ libssh2-1 -RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \ - bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13 +RUN curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin diff --git a/ci/docker/thumbv7em-none-eabi/Dockerfile b/ci/docker/thumbv7em-none-eabi/Dockerfile index fa5439a..ee82ee6 100644 --- a/ci/docker/thumbv7em-none-eabi/Dockerfile +++ b/ci/docker/thumbv7em-none-eabi/Dockerfile @@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \ curl \ libcurl4-openssl-dev \ libssh2-1 -RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \ - bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13 +RUN curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin diff --git a/ci/docker/thumbv7em-none-eabihf/Dockerfile b/ci/docker/thumbv7em-none-eabihf/Dockerfile index fa5439a..ee82ee6 100644 --- a/ci/docker/thumbv7em-none-eabihf/Dockerfile +++ b/ci/docker/thumbv7em-none-eabihf/Dockerfile @@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \ curl \ libcurl4-openssl-dev \ libssh2-1 -RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \ - bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13 +RUN curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin diff --git a/ci/docker/thumbv7m-none-eabi/Dockerfile b/ci/docker/thumbv7m-none-eabi/Dockerfile index fa5439a..ee82ee6 100644 --- a/ci/docker/thumbv7m-none-eabi/Dockerfile +++ b/ci/docker/thumbv7m-none-eabi/Dockerfile @@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \ curl \ libcurl4-openssl-dev \ libssh2-1 -RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \ - bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13 +RUN curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin |