Merge remote-tracking branch 'upstream/develop' into script-structure…

…-refactoring
nervosnetwork · Mar 28, 2019 · bba40a4 · bba40a4
2 parents 91b8e06 + a35c33f
commit bba40a4
Show file tree

Hide file tree

Showing 25 changed files with 212 additions and 748 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,6 +33,7 @@ addons:
       - texinfo
       - libtool
 
+before_install: if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 8192; fi
 install: ./devtools/ci/install.sh
 script: ./devtools/ci/script.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ addons: @@
           - texinfo
           - libtool
+    before_install: if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 8192; fi
     install: ./devtools/ci/install.sh
     script: ./devtools/ci/script.sh
@@ Expand Down @@