Merge pull request #172 from bigchaindb/fix/travis

Fix Travis
bigchaindb · May 14, 2018 · 4570b24 · 4570b24
2 parents 0c8a9c6 + fbb9b95
commit 4570b24
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 5,421 deletions.
diff --git a/.ci/travis-before-script.sh b/.ci/travis-before-script.sh
@@ -3,3 +3,7 @@
 set -e -x
 
 docker-compose up -d bigchaindb
+
+npm install
+gem install cowsay
+npm install -g codecov
diff --git a/.ci/travis_script.sh b/.ci/travis_script.sh
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 *.sublime-workspace
 *.sublime-workspace
 .DS_Store
+.vscode
 
 .env
 

diff --git a/.npmignore b/.npmignore
@@ -9,6 +9,7 @@
 *.sublime-workspace
 *.sublime-workspace
 .DS_Store
+.vscode
 
 .env
 

diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,10 @@ services:
 
 language: node_js
 
-node_js: 7
+node_js:
+  - 8
+  - 9
+  - 10
 
 cache:
     directories:
@@ -23,10 +26,8 @@ install:
 
 before_script:
   - .ci/travis-before-script.sh
-  - gem install cowsay
-  - npm install -g codecov
 
-script: yarn test
+script: npm test
 
 notifications:
     email: false
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,11 +29,11 @@ services:
       retries: 3
     command: -l DEBUG start
   tendermint:
-    image: tendermint/tendermint:0.12
+    image: tendermint/tendermint:0.19.2
     volumes:
       - ./compose/tendermint/tmdata/config.toml:/tendermint/config.toml
     entrypoint: ''
     ports:
       - "46656"
       - "46657"
-    command: bash -c "tendermint init && tendermint node"
+    command: sh -c "tendermint init && tendermint node --consensus.create_empty_blocks=false --proxy_app=tcp://bigchaindb:46658"
diff --git a/examples/src/basic-usage-async-await.js b/examples/src/basic-usage-async-await.js
@@ -1,4 +1,6 @@
-const driver = require('bigchaindb-driver') // eslint-disable-line import/no-unresolved
+/* eslint-disable import/no-unresolved */
+
+const driver = require('bigchaindb-driver')
 require('dotenv').config()
 
 

diff --git a/examples/src/basic-usage.js b/examples/src/basic-usage.js
@@ -1,4 +1,6 @@
-const driver = require('bigchaindb-driver') // eslint-disable-line import/no-unresolved
+/* eslint-disable import/no-unresolved */
+
+const driver = require('bigchaindb-driver')
 require('dotenv').config()
 
 

diff --git a/examples/src/query-assets.js b/examples/src/query-assets.js
@@ -1,4 +1,6 @@
-const driver = require('bigchaindb-driver') // eslint-disable-line import/no-unresolved
+/* eslint-disable import/no-unresolved */
+
+const driver = require('bigchaindb-driver')
 require('dotenv').config()
 
 

diff --git a/examples/src/seed-func.js b/examples/src/seed-func.js
@@ -1,6 +1,8 @@
-import bip39 from 'bip39' // eslint-disable-line import/no-unresolved
+/* eslint-disable import/no-unresolved */
 
-const driver = require('bigchaindb-driver') // eslint-disable-line import/no-unresolved
+import bip39 from 'bip39'
+
+const driver = require('bigchaindb-driver')
 
 // ======== Create Keypair ======== //
 /**

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   "main": "./dist/node/index.js",
   "browser": "./dist/browser/bigchaindb-driver.cjs2.min.js",
   "scripts": {
-    "lint": "eslint ./",
+    "lint": "./node_modules/.bin/eslint ./",
     "build": "npm run clean && npm run build:cjs && npm run build:dist",
     "build:bundle": "webpack",
     "build:cjs": "cross-env BABEL_ENV=cjs babel ./src -d dist/node",