Merge branch 'rc/poc-2'

nervosnetwork · Nov 19, 2018 · 61fcd44 · 61fcd44
2 parents d0b4d70 + b732762
commit 61fcd44
Show file tree

Hide file tree

Showing 68 changed files with 3,283 additions and 1,821 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,6 @@ admintool/example/
 
 # vagrant file
 .vagrant
+
+# nervos runtime folder
+.nervos
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,28 @@
 language: rust
 sudo: true
-cache: cargo
+cache:
+  cargo: true
+  timeout: 1024
 
 env:
   global:
-    - CLIPPY_VERSION=0.0.181
+    - CLIPPY_VERSION=0.0.187
 
 matrix:
   include:
     - os: osx
-      rust: nightly-2018-01-23
+      rust: nightly-2018-03-07
       before_script:
-        - rustup component add rustfmt-preview --toolchain=nightly-2018-01-23
+        - rustup component add rustfmt-preview --toolchain=nightly-2018-03-07
         - bash -c 'if [[ ! -e $HOME/.cargo/bin/cargo-clippy ]]; then
             cargo install clippy --vers $CLIPPY_VERSION --force;
           fi'
-    - rust: nightly-2018-01-23
+    - rust: nightly-2018-03-07
       before_install:
         - sudo apt-get -qq update
         - sudo apt-get install -y git autoconf flex bison texinfo libtool
       before_script:
-        - rustup component add rustfmt-preview --toolchain=nightly-2018-01-23
+        - rustup component add rustfmt-preview --toolchain=nightly-2018-03-07
         - bash -c 'if [[ ! -e $HOME/.cargo/bin/cargo-clippy ]]; then
             cargo install clippy --vers $CLIPPY_VERSION --force;
           fi'