Skip to content

Commit 760e6da

Browse files
authored
Merge branch 'master' into greenkeeper/chai-4.1.2
2 parents 9aad9f0 + 1d41773 commit 760e6da

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.travis.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
language: node_js
2-
compiler: clang
32
services:
43
- rabbitmq
54
node_js:
65
- '6'
76
sudo: true
8-
before_install:
9-
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
10-
- sudo add-apt-repository ppa:boost-latest/ppa -y
11-
- sudo apt-get update -qq
12-
- sudo apt-get install g++-4.8
13-
- sudo apt-get install libboost1.55-all-dev libev-dev
14-
- sudo apt-get install pkg-config cmake openssl libc-ares-dev
7+
dist: trusty
8+
before_install:
9+
- sudo apt-get install libev-dev pkg-config cmake openssl libc-ares-dev
1510
install:
1611
- export CC=gcc-4.8
1712
- export CXX=g++-4.8

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"dependencies": {},
1515
"devDependencies": {
1616
"amqplib": "^0.5.1",
17-
"chai": "~4.1.2",
17+
"chai": "^4.1.2",
1818
"coffee-script": "^1.8.0",
19-
"mocha": "~3.4.2",
19+
"mocha": "^4.1.0",
2020
"msgflo": "^0.10.0",
21-
"mqtt": "~2.7.2"
21+
"mqtt": "^2.15.0"
2222
},
2323
"keywords": [],
2424
"bin": {},

0 commit comments

Comments
 (0)