Skip to content

Commit a1862fb

Browse files
authored
Merge branch 'master' into greenkeeper/eslint-6.0.0
2 parents 3f8c270 + ea0e0b6 commit a1862fb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ script:
2323
- 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
2424
- 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi'
2525
sudo: false
26+
branches:
27+
only:
28+
- master
2629
env:
2730
- TEST=true
2831
matrix:

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"@babel/parser": "^7.4.4",
1919
"babel-cli": "^6.26.0",
2020
"babel-core": "^6.26.3",
21-
"babel-eslint": "^7.2.3",
21+
"babel-eslint": "^10.0.2",
2222
"babel-jest": "^20.0.3",
2323
"babel-plugin-transform-replace-object-assign": "^1.0.0",
2424
"babel-polyfill": "^6.26.0",
2525
"babel-preset-env": "^1.7.0",
2626
"babylon": "^6.18.0",
27-
"coveralls": "^2.13.3",
27+
"coveralls": "^3.0.4",
2828
"eslint": "^6.0.0",
2929
"eslint-config-airbnb-base": "^13.1.0",
3030
"eslint-plugin-import": "^2.17.2",

0 commit comments

Comments
 (0)