Merge pull request #9065 from CesiumGS/node-12

Switch to Node 12 for CI
CesiumGS · Jul 28, 2020 · 3e8a6cc · 3e8a6cc
2 parents 67a36c7 + a8b69db
commit 3e8a6cc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 25 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "10"
+  - "12"
 addons:
   chrome: stable
   firefox: latest

diff --git a/Specs/.eslintrc.json b/Specs/.eslintrc.json
@@ -9,7 +9,7 @@
     "overrides": [
         {
             "files": [
-                "karma.conf.js"
+                "karma.conf.cjs"
             ],
             "parserOptions": {
                 "sourceType": "script"

diff --git a/Specs/karma.conf.js → Specs/karma.conf.cjs b/Specs/karma.conf.js → Specs/karma.conf.cjs
diff --git a/gulpfile.cjs b/gulpfile.cjs
@@ -42,7 +42,7 @@ if (/\.0$/.test(version)) {
   version = version.substring(0, version.length - 2);
 }
 
-var karmaConfigFile = path.join(__dirname, "Specs/karma.conf.js");
+var karmaConfigFile = path.join(__dirname, "Specs/karma.conf.cjs");
 var travisDeployUrl =
   "http://cesium-dev.s3-website-us-east-1.amazonaws.com/cesium/";
 
@@ -115,7 +115,7 @@ var filesToConvertES6 = [
   "!Source/Workers/cesiumWorkerBootstrapper.js",
   "!Source/Workers/transferTypedArrayTest.js",
   "!Specs/karma-main.js",
-  "!Specs/karma.conf.js",
+  "!Specs/karma.conf.cjs",
   "!Specs/spec-main.js",
   "!Specs/SpecList.js",
   "!Specs/TestWorkers/**",