Skip to content

Commit ab9a011

Browse files
committed
Auto merge of #461 - alexcrichton:bump, r=alexcrichton
Bump to 0.2.18
2 parents 94848c1 + 93dbca0 commit ab9a011

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

Diff for: .travis.yml

+7-8
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
36+
rust: nightly-2016-11-26
3737
script: sh ci/dox.sh
3838

3939
# stable compat
@@ -87,7 +87,10 @@ matrix:
8787
rust: stable
8888
- os: linux
8989
env: TARGET=mips64-unknown-linux-gnuabi64
90-
rust: nightly
90+
rust: beta
91+
- os: linux
92+
env: TARGET=mips-unknown-linux-gnu
93+
rust: beta
9194

9295
# beta
9396
- os: linux
@@ -100,14 +103,10 @@ matrix:
100103
# nightly
101104
- os: linux
102105
env: TARGET=x86_64-unknown-linux-gnu
103-
rust: nightly
106+
rust: nightly-2016-11-26
104107
- os: osx
105108
env: TARGET=x86_64-apple-darwin
106-
rust: nightly
107-
- os: linux
108-
env: TARGET=mips-unknown-linux-gnu
109-
# not sure why this has to be nightly...
110-
rust: nightly
109+
rust: nightly-2016-11-26
111110

112111
# QEMU based targets that compile in an emulator
113112
- os: linux

Diff for: Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "libc"
4-
version = "0.2.17"
4+
version = "0.2.18"
55
authors = ["The Rust Project Developers"]
66
license = "MIT/Apache-2.0"
77
readme = "README.md"

Diff for: ci/docker/mips-unknown-linux-musl/Dockerfile

+4-1
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/ar71xx/generic/OpenWrt-SDK-ar71xx-generic_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/ar71xx/generic/OpenWrt-SDK-ar71xx-generic_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-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
1013
tar xjf - -C /toolchain --strip-components=1
1114

1215
ENV PATH=$PATH:/rust/bin:/toolchain/staging_dir/toolchain-mips_34kc_gcc-5.3.0_musl-1.1.15/bin \

0 commit comments

Comments
 (0)