diff --git a/.travis.yml b/.travis.yml index c4d0765ff..2b27ae407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,24 @@ language: node_js -compiler: - - clang - - gcc node_js: - "10" env: - GH_PAGES_SRC="build-docs" -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: - # - sudo apt-get update - # - sudo apt-get install curl g++-8 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev mingw-w64 zlib1g-dev - curl -o- -L https://yarnpkg.com/install.sh | bash - export PATH=$HOME/.yarn/bin:$(yarn global bin):$PATH cache: @@ -28,17 +26,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 99d11ac3b..e0e278007 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.spec.ts b/packages/db/src/engines/unused/RocksDb.spec.ts-unused similarity index 100% rename from packages/db/src/engines/RocksDb.spec.ts rename to packages/db/src/engines/unused/RocksDb.spec.ts-unused diff --git a/packages/db/src/engines/RocksDb.ts b/packages/db/src/engines/unused/RocksDb.ts-unused similarity index 92% rename from packages/db/src/engines/RocksDb.ts rename to packages/db/src/engines/unused/RocksDb.ts-unused index 1391b44d2..82e8d186c 100644 --- a/packages/db/src/engines/RocksDb.ts +++ b/packages/db/src/engines/unused/RocksDb.ts-unused @@ -2,6 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +// At this point, it doesn't seem to write anything to disk, so subsequent startups +// has an empty database - again. Something is wrong in the config and with +// life being too short... + // "rocksdb-node": "jacogr/rocksdb-node#00ebfdbf0462ee615f4f48f1db403fd4df8471ea", import { BaseDb, ProgressCb } from '../types'; diff --git a/yarn.lock b/yarn.lock index 941d4189c..4311c0bc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7546,11 +7546,6 @@ mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099" - integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw== - nan@^2.12.0, nan@^2.12.1, nan@^2.2.1, nan@^2.9.2: version "2.12.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" @@ -9543,12 +9538,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rocksdb-node@jacogr/rocksdb-node#00ebfdbf0462ee615f4f48f1db403fd4df8471ea: - version "1.7.2" - resolved "https://codeload.github.com/jacogr/rocksdb-node/tar.gz/00ebfdbf0462ee615f4f48f1db403fd4df8471ea" - dependencies: - nan "2.11.0" - rsvp@^3.3.3: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"