Skip to content

Commit 32b4870

Browse files
author
Jorge Aparicio
committed
CI: use Xargo 0.2.1
1 parent f316109 commit 32b4870

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ matrix:
1313
- env: TARGET=thumbv7em-none-eabihf
1414
env: TARGET=x86_64-unknown-linux-gnu
1515

16+
install:
17+
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION
18+
- source ~/.cargo/env
19+
- rustup component add rust-src
20+
1621
script:
1722
- cargo generate-lockfile
1823
- sh ci/run-docker.sh $TARGET

ci/docker/thumbv6m-none-eabi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \
55
curl \
66
libcurl4-openssl-dev \
77
libssh2-1
8-
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
9-
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
8+
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
9+
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin

ci/docker/thumbv7em-none-eabi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \
55
curl \
66
libcurl4-openssl-dev \
77
libssh2-1
8-
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
9-
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
8+
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
9+
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin

ci/docker/thumbv7em-none-eabihf/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \
55
curl \
66
libcurl4-openssl-dev \
77
libssh2-1
8-
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
9-
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
8+
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
9+
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin

ci/docker/thumbv7m-none-eabi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ RUN apt-get install -y --no-install-recommends \
55
curl \
66
libcurl4-openssl-dev \
77
libssh2-1
8-
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
9-
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
8+
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
9+
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin

0 commit comments

Comments
 (0)