diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | ci/docker/mips-unknown-linux-musl/Dockerfile | 5 |
4 files changed, 14 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 3a8c9cebe7..71c771d2b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: # build documentation - os: linux env: TARGET=x86_64-unknown-linux-gnu - rust: nightly + rust: nightly-2016-11-26 script: sh ci/dox.sh # stable compat @@ -87,7 +87,10 @@ matrix: rust: stable - os: linux env: TARGET=mips64-unknown-linux-gnuabi64 - rust: nightly + rust: beta + - os: linux + env: TARGET=mips-unknown-linux-gnu + rust: beta # beta - os: linux @@ -100,14 +103,10 @@ matrix: # nightly - os: linux env: TARGET=x86_64-unknown-linux-gnu - rust: nightly + rust: nightly-2016-11-26 - os: osx env: TARGET=x86_64-apple-darwin - rust: nightly - - os: linux - env: TARGET=mips-unknown-linux-gnu - # not sure why this has to be nightly... - rust: nightly + rust: nightly-2016-11-26 # QEMU based targets that compile in an emulator - os: linux diff --git a/Cargo.lock b/Cargo.lock index 5332bf28bf..53b07dcc3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,7 +3,7 @@ name = "libc-test" version = "0.1.0" dependencies = [ "ctest 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.17", + "libc 0.2.18", ] [[package]] @@ -48,7 +48,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.17" +version = "0.2.18" [[package]] name = "log" diff --git a/Cargo.toml b/Cargo.toml index c08ab3aab9..7ac523e27a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libc" -version = "0.2.17" +version = "0.2.18" authors = ["The Rust Project Developers"] license = "MIT/Apache-2.0" readme = "README.md" diff --git a/ci/docker/mips-unknown-linux-musl/Dockerfile b/ci/docker/mips-unknown-linux-musl/Dockerfile index 77c6adb435..cbc41c24d1 100644 --- a/ci/docker/mips-unknown-linux-musl/Dockerfile +++ b/ci/docker/mips-unknown-linux-musl/Dockerfile @@ -6,7 +6,10 @@ RUN apt-get install -y --no-install-recommends \ bzip2 RUN mkdir /toolchain -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 | \ + +# Note that this originally came from: +# 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 +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 | \ tar xjf - -C /toolchain --strip-components=1 ENV PATH=$PATH:/rust/bin:/toolchain/staging_dir/toolchain-mips_34kc_gcc-5.3.0_musl-1.1.15/bin \ |