diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index db631d033b53..000000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -image: Visual Studio 2017 - -version: '{build}' - -environment: - matrix: - - nodejs_version: "8" - -install: - # Get the latest stable version of Node.js - - ps: Install-Product node $env:nodejs_version - # install modules - - npm install - -test_script: - - npm --silent run minifyRelease - - npm --silent run build-specs - - npm --silent run test -- --browsers IE --webgl-stub --release --suppressPassed - -# Don't actually build. -build: off diff --git a/.travis.yml b/.travis.yml index 0011687bc9b3..dbd07e5d8370 100644 --- 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 index 253d3533baa8..b1a827ceac51 100644 --- 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 b/Specs/karma.conf.cjs similarity index 100% rename from Specs/karma.conf.js rename to Specs/karma.conf.cjs diff --git a/gulpfile.cjs b/gulpfile.cjs index 4e159b3c826c..6f543cda527c 100644 --- 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/**",