Merge branch 'chore/july-eom-tidy'

Fdawgs · Jul 14, 2020 · 6d307dc · 6d307dc
2 parents 0301444 + 48a9d38
commit 6d307dc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/.prettierignore b/.prettierignore
diff --git a/.travis.yml b/.travis.yml
@@ -25,15 +25,13 @@ branches:
 script: echo "Running tests against $(node -v)..."
 
 jobs:
-    allow_failures:
-        - os: osx
     include:
         - stage: Produce Coverage
-          node_js: node
+          node_js: lts/*
           os: windows
           script: jest --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
         - stage: NPM release
-          node_js: node
+          node_js: lts/*
           os: linux
           deploy:
             provider: npm

diff --git a/package.json b/package.json
@@ -22,8 +22,8 @@
 		"doc": "jsdoc2md src/index.js > API.md && prettier API.md --write",
 		"dupe-check": "yarn jsinspect ./src",
 		"jest": "jest src --coverage",
-		"lint": "eslint . --cache --ext js,jsx,ts,tsx",
-		"prettier": "prettier . --write",
+		"lint": "eslint . --cache --ext js,jsx,ts,tsx --ignore-path .gitignore",
+		"prettier": "prettier . --write --ignore-path .gitignore",
 		"test": "yarn lint && yarn test-only",
 		"test-coverage": "cross-env NODE_ENV=test jest --coverage --runInBand",
 		"test-only": "cross-env NODE_ENV=test jest --detectOpenHandles --runInBand"