From eae98468492a92accf51bc711b62b5055a33c6a3 Mon Sep 17 00:00:00 2001
From: Landon Abney <Landonabney@gmail.com>
Date: Fri, 16 Sep 2016 09:37:29 -0700
Subject: [PATCH] Update the CI configuration

* Use the bundled Node.js and stop forcing install of Node.js v6
---
 .travis.yml  | 8 +-------
 appveyor.yml | 5 -----
 circle.yml   | 4 +---
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 043a3490..ac5de64e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,15 @@
 ### Project specific config ###
-
-# Installed for linting the project
-language: node_js
+language: generic
 
 matrix:
   include:
     - os: linux
-      node_js: "6"
       env: ATOM_CHANNEL=stable
 
     - os: linux
-      node_js: "6"
       env: ATOM_CHANNEL=beta
 
     - os: osx
-      node_js: "6"
       env: ATOM_CHANNEL=stable
 
 env:
@@ -22,7 +17,6 @@ env:
     # Pre-install the required language file as package activation doesn't wait
     # for the installation to complete.
     - APM_TEST_PACKAGES="language-postcss"
-    - ATOM_LINT_WITH_BUNDLED_NODE="false"
 
 ### Generic setup follows ###
 script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
diff --git a/appveyor.yml b/appveyor.yml
index aa3ac6f9..8298df37 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,16 +1,11 @@
 ### Project specific config ###
 environment:
   APM_TEST_PACKAGES: language-postcss
-  ATOM_LINT_WITH_BUNDLED_NODE: "false"
 
   matrix:
   - ATOM_CHANNEL: stable
   - ATOM_CHANNEL: beta
 
-install:
-  # Install Node.js to run any configured linters
-  - ps: Install-Product node 6
-
 ### Generic setup follows ###
 build_script:
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
diff --git a/circle.yml b/circle.yml
index 475dab3a..ceb33d99 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,13 +4,11 @@ test:
 
 dependencies:
   override:
+    # If nothing is put here, CircleCI will run `npm install` using the system Node.js
     - echo "Managed in the script"
 
 machine:
-  node:
-    version: 6
   environment:
-    ATOM_LINT_WITH_BUNDLED_NODE: "false"
     # Pre-install the required language file as package activation doesn't wait
     # for the installation to complete.
     APM_TEST_PACKAGES: "language-postcss"