Merge remote-tracking branch 'upstream/master' into esm-squashed

4 years ago · f831a0a835
2 changed files with 1 additions and 8 deletions
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@ -16,7 +16,7 @@ jobs:
				@@ -16,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 15.x]
        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/

    steps:
--- a/.travis.yml
+++ b/.travis.yml
@ -1,7 +0,0 @@
				@@ -1,7 +0,0 @@
-language: node_js
-node_js:
-  - "10"
-  - "12"
-  - "14"
-  - "15"
-  - "16"