deps: update npm to 6.11.3

PR-URL: https://github.com/nodejs/node/pull/29430
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

1 files changed, 31 insertions, 15 deletions

diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
index ef949a0d45..1d2e3120c4 100644
--- a/deps/npm/.travis.yml
+++ b/deps/npm/.travis.yml
@@ -1,37 +1,53 @@
 sudo: true
 # need to declare the language as well as the matrix below
 language: node_js
+
+os:
+  - linux
+
+node_js:
+  - 12
+  - 10
+  - 8
+
+env: "DEPLOY_VERSION=testing"
+
 # having top-level `env:` adds a phantom build
 # https://github.com/travis-ci/travis-ci/issues/4681
 #env: DEPLOY_VERSION=testing
 matrix:
   include:
-    # LTS is our most important target
+    # Run the sudotest, but only on Linux
     - node_js: "12"
       # DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
       # only gather coverage info for LTS
       env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
       script:
         # run the sudo tests, with coverage enabled
-        - "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage"
-        - "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/broken-under-*/*.js\""
-    # previous LTS is next most important
+        - "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage  --timeout 600"
+
+    # also run standard and license checking
     - node_js: "10"
-      env: DEPLOY_VERSION=testing
       script:
-      - "npx standard"
-      - "node . run licenses"
-      - "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
-    - node_js: "8"
-      env: DEPLOY_VERSION=testing
+        - "npx standard"
+        - "node . run licenses"
+
+    # separate out node 6 so we can turn off caching, because that
+    # always breaks for some reason.
     - node_js: "6"
-      env: DEPLOY_VERSION=testing
+      cache: false
+      env: "DEPLOY_VERSION=testing"
+
+    # only run one test on Windows, because it's hella slow
+    - node_js: "12"
+      os: "windows"
+      env: "DEPLOY_VERSION=testing"
+
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
-cache:
-  directories:
-  - node_modules/.cache
+
 install:
   - "node . install"
+
 script:
-  - "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
+  - "node . run tap -- \"test/tap/*.js\" -t600 -Rclassic -c"