Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

Commit 4157261

Browse files
authored
Merge pull request #270 from matiu/chore/deps
Chore/deps
2 parents 28aa52b + a48c473 commit 4157261

File tree

12 files changed

+45110
-37702
lines changed

12 files changed

+45110
-37702
lines changed

.travis.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- '6'
54
- '8'
6-
before_install:
7-
- npm install -g bower
8-
- export DISPLAY=:99.0
9-
- sh -e /etc/init.d/xvfb start
105
install:
11-
- bower install
12-
- npm install
6+
- npm ci
137
after_script:
148
- gulp coveralls
9+
10+
cache:
11+
directories:
12+
- "$HOME/.npm"
13+
14+
dist: trusty # needs Ubuntu Trusty
15+
# Note: if you switch to sudo: false, you'll need to launch Chrome with --no-sandbox.
16+
# See https://github.com/travis-ci/travis-ci/issues/8836
17+
sudo: required
18+
addons:
19+
chrome: stable # have Travis install Chrome stable.

bitcore-lib.js

Lines changed: 37941 additions & 37627 deletions
Large diffs are not rendered by default.

bower.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Bitcore v0.15.0
1+
# Bitcore v0.16.0
22

33
## Principles
44

gulpfile.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1+
'use strict';
12

2-
3-
var bitcoreTasks = require('bitcore-build');
4-
5-
bitcoreTasks('lib');
3+
var startGulp = require('bitcore-build');
4+
Object.assign(exports, startGulp('lib'))

karma.conf.js

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,19 @@
44
module.exports = function(config) {
55

66
config.set({
7-
browsers: ['Firefox'],
8-
frameworks: ['mocha', 'detectBrowsers'],
9-
detectBrowsers: {
10-
enabled: true,
11-
usePhantomJS: false,
12-
postDetection: function(availableBrowser) {
13-
// modify to enable additional browsers if available
14-
var runBrowsers = ['Firefox', 'Chrome'];
15-
var browsers = [];
16-
for(var i = 0; i < runBrowsers.length; i++) {
17-
if(~availableBrowser.indexOf(runBrowsers[i])) {
18-
browsers.push(runBrowsers[i]);
19-
}
20-
}
21-
return browsers;
22-
}
23-
},
24-
singleRun: true,
7+
browsers: ['ChromeHeadless'],
8+
frameworks: ['mocha'],
9+
singleRun: false,
10+
reporters: ['progress'],
11+
logLevel: config.LOG_INFO,
12+
// port: 9876, // karma web server port
13+
autoWatch: false,
2514
files: [
26-
'tests.js'
15+
'../../tests.js'
2716
],
2817
plugins: [
2918
'karma-mocha',
3019
'karma-chrome-launcher',
31-
'karma-firefox-launcher',
32-
'karma-detect-browsers'
3320
]
3421
});
3522

0 commit comments

Comments
 (0)