Merge remote-tracking branch 'origin/master' into greenkeeper/semanti…

…c-release-15.12.4
jwalton · Dec 3, 2018 · b1ba003 · b1ba003
2 parents c1debc6 + 0b634a6
commit b1ba003
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ install:
   - travis_retry npm install
 before_script:
   - nsp check
-  - greenkeeper-lockfile-update
+  - GK_LOCK_YARN_OPTS="--ignore-engines" greenkeeper-lockfile-update
 after_script:
   # Only the first job will upload the lockfile
   - greenkeeper-lockfile-upload

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@types/chai": "^4.1.4",
     "@types/chai-as-promised": "^7.1.0",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.10.0",
+    "@types/node": "^10.12.12",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "coveralls": "^3.0.2",