Merge branch 'master' into nim_v1

scripts/build_nim.sh

@@ -12,7 +12,7 @@ set -e
 
 # Git commits
 CSOURCES_COMMIT="f72f471adb743bea4f8d8c59d19aa1cb885dcc59" # 0.20.0
-NIMBLE_COMMIT="d15c8530cb7480ce39ffa85a2dd9819d2d4fc645" # 0.10.2
+NIMBLE_COMMIT="4007b2a778429a978e12307bf13a038029b4c4d9" # 0.11.0
 
 # script arguments
 [[ $# -ne 4 ]] && { echo "usage: $0 nim_dir csources_dir nimble_dir ci_cache_dir"; exit 1; }

scripts/build_rocksdb.sh

@@ -16,6 +16,10 @@ ROCKSDBVER="5.17.2"
 [[ $# -ne 1 ]] && { echo "usage: $0 ci_cache_dir"; exit 1; }
 CI_CACHE="$1" # here we cache the installed files
 
+# env vars
+
+[[ -z "$NPROC" ]] && NPROC=2 # number of CPU cores available
+
 # install from cache and exit, if the version we want is already there
 if [[ -n "$CI_CACHE" ]] && ls "$CI_CACHE"/lib/librocksdb* 2>/dev/null | grep -q "$ROCKSDBVER"; then
 	sudo cp -a "$CI_CACHE"/* /usr/local/
@@ -24,10 +28,10 @@ fi
 
 # build it
 echo "Building RocksDB"
-curl -O -L -s -S https://github.com/facebook/rocksdb/archive/v$ROCKSDBVER.tar.gz
-tar xzf v$ROCKSDBVER.tar.gz
-cd rocksdb-$ROCKSDBVER
-make DISABLE_WARNING_AS_ERROR=1 -j2 shared_lib
+curl -O -L -s -S https://github.com/facebook/rocksdb/archive/v${ROCKSDBVER}.tar.gz
+tar xzf v${ROCKSDBVER}.tar.gz
+cd rocksdb-${ROCKSDBVER}
+make DISABLE_WARNING_AS_ERROR=1 -j${NPROC} shared_lib
 
 # install it
 if [[ -n "../$CI_CACHE" ]]; then