Skip to content

Commit b2e56d5

Browse files
committed
Auto merge of #463 - alexcrichton:musl-update, r=alexcrichton
Update both mips musl download locations
2 parents 0ac39c5 + b9430b0 commit b2e56d5

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ matrix:
3333
# build documentation
3434
- os: linux
3535
env: TARGET=x86_64-unknown-linux-gnu
36-
rust: nightly-2016-11-26
36+
rust: nightly
3737
script: sh ci/dox.sh
3838

3939
# stable compat
@@ -103,10 +103,10 @@ matrix:
103103
# nightly
104104
- os: linux
105105
env: TARGET=x86_64-unknown-linux-gnu
106-
rust: nightly-2016-11-26
106+
rust: nightly
107107
- os: osx
108108
env: TARGET=x86_64-apple-darwin
109-
rust: nightly-2016-11-26
109+
rust: nightly
110110

111111
# QEMU based targets that compile in an emulator
112112
- os: linux

ci/docker/mipsel-unknown-linux-musl/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ RUN apt-get install -y --no-install-recommends \
66
bzip2
77

88
RUN mkdir /toolchain
9-
RUN curl -L https://downloads.openwrt.org/snapshots/trunk/malta/generic/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
9+
10+
# Note that this originally came from:
11+
# https://downloads.openwrt.org/snapshots/trunk/malta/generic/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2
12+
RUN curl -L https://s3.amazonaws.com/rust-lang-ci/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
1013
tar xjf - -C /toolchain --strip-components=2
1114

1215
ENV PATH=$PATH:/rust/bin:/toolchain/bin \

0 commit comments

Comments
 (0)