From 25f380a967bd647c2a3810e0051ca85fd14d3eea Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Mon, 27 Jul 2020 15:39:54 -0400 Subject: [PATCH 1/3] Switch to Node 12 for CI While we updated Cesium to work on 12, we never actually made CI use it. Traditionally we always use the active LTS for CI (which covers 12 until October when it becomes 14). --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 86a950bd48acae71a7d085af7d5433b89215928c Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Mon, 27 Jul 2020 16:04:08 -0400 Subject: [PATCH 2/3] Maybe fix CI --- Specs/.eslintrc.json | 2 +- Specs/{karma.conf.js => karma.conf.cjs} | 0 gulpfile.cjs | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename Specs/{karma.conf.js => karma.conf.cjs} (100%) 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/**", From a8b69db020213e44e394c01529cc627ab3759a96 Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Mon, 27 Jul 2020 18:29:47 -0400 Subject: [PATCH 3/3] Remove no longer used appveyor configuration --- .appveyor.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .appveyor.yml 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