Skip to content

Commit fb5cb0e

Browse files
author
Jorge Aparicio
committed
fix Xargo installation
1 parent d8fa45a commit fb5cb0e

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

ci/docker/thumbv6m-none-eabi/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM ubuntu:16.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
5+
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
6+
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.10
57
ENV AR_thumbv6m_none_eabi=arm-none-eabi-ar \
68
CARGO_TARGET_THUMBV6M_NONE_EABI_LINKER=arm-none-eabi-gcc \
79
CC_thumbv6m_none_eabi=arm-none-eabi-gcc \

ci/docker/thumbv7em-none-eabi/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM ubuntu:16.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
5+
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
6+
bash -s -- --at /usr/bin --from japaric/xargo --tag v0.1.10
57
ENV AR_thumbv7em_none_eabi=arm-none-eabi-ar \
68
CARGO_TARGET_THUMBV7EM_NONE_EABI_LINKER=arm-none-eabi-gcc \
79
CC_thumbv7em_none_eabi=arm-none-eabi-gcc \

ci/docker/thumbv7em-none-eabihf/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM ubuntu:16.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
5+
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
6+
bash -s -- --at /usr/bin --from japaric/xargo --tag v0.1.10
57
ENV AR_thumbv7em_none_eabihf=arm-none-eabi-ar \
68
CARGO_TARGET_THUMBV7EM_NONE_EABIHF_LINKER=arm-none-eabi-gcc \
79
CC_thumbv7em_none_eabihf=arm-none-eabi-gcc \

ci/docker/thumbv7m-none-eabi/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM ubuntu:16.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
5+
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
6+
bash -s -- --at /usr/bin --from japaric/xargo --tag v0.1.10
57
ENV AR_thumbv7m_none_eabi=arm-none-eabi-ar \
68
CARGO_TARGET_THUMBV7M_NONE_EABI_LINKER=arm-none-eabi-gcc \
79
CC_thumbv7m_none_eabi=arm-none-eabi-gcc \

ci/run.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ set -e
33
# Test our implementation
44
case $1 in
55
thumb*)
6-
curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
7-
bash -s -- --at /usr/bin --from japaric/xargo --tag v0.1.10
86
xargo build --target $1
97
xargo build --target $1 --release
108
;;

0 commit comments

Comments
 (0)