Skip to content

Commit

Permalink
feat: upgrade to rust 1.31.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangsoledad authored and doitian committed Jan 10, 2019
1 parent 8d82ac2 commit 4e9f202
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ env:
matrix:
include:
- os: osx
rust: 1.31.0
rust: 1.31.1
install:
- cargo fmt --version || rustup component add rustfmt
- cargo clippy --version || rustup component add clippy
env: SUITE=ci
- rust: 1.31.0
- rust: 1.31.1
addons:
apt:
packages:
Expand Down
15 changes: 4 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md), an

## Build dependencies

CKB is currently tested mainly with `stable-1.31.0` on Linux and Mac OSX.
CKB is currently tested mainly with `stable-1.31.1` on Linux and Mac OSX.

We recommend installing Rust through [rustup](https://www.rustup.rs/)

```bash
# Get rustup from rustup.rs, then in your `ckb` folder:
rustup override set 1.31.0
rustup override set 1.31.1
rustup component add rustfmt
rustup component add clippy
```
Expand All @@ -50,20 +50,13 @@ You also need to get the following packages:
* Ubuntu and Debian:

```shell
sudo apt-get install git autoconf flex bison texinfo libtool pkg-config libssl-dev libclang-dev
```

If you are on Ubuntu 18.04, you might run into `'stdarg.h' file not found` error, this is because `librocksdb-sys` fails to find the correct include path. A temporary fix until `librocksdb-sys` fixes this problem is as follows:

```shell
sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/7/include/stdarg.h /usr/include/stdarg.h
sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/7/include/stddef.h /usr/include/stddef.h
sudo apt-get install git gcc libc6-dev pkg-config libssl-dev libclang-dev clang
```

* Archlinux

```shell
sudo pacman -Sy git autoconf flex bison texinfo libtool pkg-config openssl-1.0 clang
sudo pacman -Sy git gcc pkgconf openssl-1.0 clang
```

If you get openssl related errors in compiling, try the following environment variables to specify openssl-1.0:
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.31.0
1.31.1

0 comments on commit 4e9f202

Please sign in to comment.