Skip to content

Commit

Permalink
downgrade rustc (tikv#1479)
Browse files Browse the repository at this point in the history
  • Loading branch information
BusyJay authored Jan 9, 2017
1 parent f982e82 commit 3b5be00
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ matrix:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.8', 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libdw-dev', 'libelf-dev', 'elfutils', 'binutils-dev']
- os: linux
rust: nightly
env: COMPILER=g++-4.8 RUSTC_DATE=2016-08-06 ENABLE_FEATURES=default SKIP_TESTS=true CXX=g++-4.8
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.8', 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libdw-dev', 'libelf-dev', 'elfutils', 'binutils-dev']
- os: osx
rust: nightly
env: COMPILER=clang++ RUSTC_DATE=2016-12-19 CXX=clang++
Expand Down
2 changes: 1 addition & 1 deletion docker/release_dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN yum update -y && \
yum install -y devtoolset-4-gcc-c++ python27 && \
yum clean all

RUN curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --date=2016-12-19 --disable-sudo -y --channel=nightly
RUN curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --date=2016-08-06 --disable-sudo -y --channel=nightly

ADD https://github.com/pingcap/tikv/archive/master.tar.gz /master.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion docker/rust_dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ RUN cd / && \
cd / && \
rm -rf /rocksdb-4.12.fb /rocksdb.tar.gz

RUN curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --date=2016-12-19 --disable-sudo -y --channel=nightly
RUN curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --date=2016-08-06 --disable-sudo -y --channel=nightly
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// limitations under the License.

#![crate_type = "lib"]
#![allow(stable_features)]
#![feature(mpsc_recv_timeout)]
#![feature(test)]
#![feature(btree_range, collections_bound)]
#![feature(fnbox)]
Expand Down

0 comments on commit 3b5be00

Please sign in to comment.