From fef3e85c1d22fd3db5566f82ff4eea61e796951d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 11 Mar 2019 14:28:48 +0100 Subject: [PATCH] Flip-flop, Rocks removed again (#357) --- .travis.yml | 52 +++++++++---------- packages/db/package.json | 1 - .../{RocksDb.ts => unused/RocksDb.ts-unused} | 0 3 files changed, 26 insertions(+), 27 deletions(-) rename packages/db/src/engines/{RocksDb.ts => unused/RocksDb.ts-unused} (100%) diff --git a/.travis.yml b/.travis.yml index b9e169c02..1221c7383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,21 +4,21 @@ node_js: env: - GH_PAGES_SRC="build-docs" # compiler & addons are both used for RocksDb -compiler: - - clang - - gcc -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - curl - - g++-8 - - libbz2-dev - - libgflags-dev - - libsnappy-dev - - mingw-w64 - - zlib1g-dev +# compiler: +# - clang +# - gcc +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - curl +# - g++-8 +# - libbz2-dev +# - libgflags-dev +# - libsnappy-dev +# - mingw-w64 +# - zlib1g-dev before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash - export PATH=$HOME/.yarn/bin:$(yarn global bin):$PATH @@ -27,17 +27,17 @@ cache: directories: - node_modules install: - - export ROCKSDB=$HOME/rocksdb-master - - pushd $HOME - - curl -sLO https://github.com/facebook/rocksdb/archive/master.zip - - unzip -q master.zip - - cd rocksdb-master - - make shared_lib - - popd - - export CFLAGS="-I${ROCKSDB}/include/" - - export CXXFLAGS="-I${ROCKSDB}/include/" - - export LDFLAGS="-L${ROCKSDB} -lrocksdb -lstdc++ -lm -lz" - - export LD_LIBRARY_PATH="${ROCKSDB}:/usr/local/lib" + # - export ROCKSDB=$HOME/rocksdb-master + # - pushd $HOME + # - curl -sLO https://github.com/facebook/rocksdb/archive/master.zip + # - unzip -q master.zip + # - cd rocksdb-master + # - make shared_lib + # - popd + # - export CFLAGS="-I${ROCKSDB}/include/" + # - export CXXFLAGS="-I${ROCKSDB}/include/" + # - export LDFLAGS="-L${ROCKSDB} -lrocksdb -lstdc++ -lm -lz" + # - export LD_LIBRARY_PATH="${ROCKSDB}:/usr/local/lib" - yarn script: - yarn polkadot-dev-build-travis diff --git a/packages/db/package.json b/packages/db/package.json index e4253eba6..5052a2d28 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -37,7 +37,6 @@ "lru_map": "^0.3.3", "mkdirp": "^0.5.1", "node-lmdb": "^0.6.2", - "rocksdb-node": "jacogr/rocksdb-node#00ebfdbf0462ee615f4f48f1db403fd4df8471ea", "snappy": "^6.1.2" } } diff --git a/packages/db/src/engines/RocksDb.ts b/packages/db/src/engines/unused/RocksDb.ts-unused similarity index 100% rename from packages/db/src/engines/RocksDb.ts rename to packages/db/src/engines/unused/RocksDb.ts-unused