From 881f38e1fa1ac765fa7ad78518e4cd0d5537d40e Mon Sep 17 00:00:00 2001
From: Landon Abney <Landonabney@gmail.com>
Date: Wed, 6 Jul 2016 09:47:02 -0700
Subject: [PATCH 1/2] Update CI configurations

Update the CI configurations, primarily ensuring that Node.js 6 is installed for the linters.
---
 .travis.yml  | 34 ++++++++++++++++++++--------------
 appveyor.yml | 23 +++++++++--------------
 circle.yml   | 13 ++++++-------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35cd5a4..9159891 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,23 @@
+# Project specific config
+os:
+  - linux
+  - osx
+
+env:
+  global:
+    - APM_TEST_PACKAGES=""
+
+  matrix:
+    - ATOM_CHANNEL=stable
+    - ATOM_CHANNEL=beta
+
+# Installed for linting the project
+language: node_js
+node_js: "6"
+
+# Generic setup follows
+script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
+
 notifications:
   email:
     on_success: never
@@ -7,25 +27,11 @@ branches:
   only:
     - master
 
-script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
-
 git:
   depth: 10
 
 sudo: false
 
-os:
-  - linux
-  - osx
-
-env:
-  global:
-    - APM_TEST_PACKAGES=""
-
-  matrix:
-    - ATOM_CHANNEL=stable
-    - ATOM_CHANNEL=beta
-
 addons:
   apt:
     packages:
diff --git a/appveyor.yml b/appveyor.yml
index 2500e03..637148e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,20 +1,15 @@
+install:
+  - ps: Install-Product node 6
+
+build_script:
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
+
 version: "{build}"
-os: Windows Server 2012 R2
+platform: x64
 branches:
   only:
     - master
 test: off
 deploy: off
-
-install:
-  - appveyor DownloadFile https://atom.io/download/windows -FileName AtomSetup.exe
-  - AtomSetup.exe /silent
-
-build_script:
-  - cd %APPVEYOR_BUILD_FOLDER%
-  - SET PATH=%LOCALAPPDATA%\atom\bin;%PATH%
-  - atom -v
-  - apm -v
-  - apm clean
-  - apm install
-  - apm test
+clone_depth: 10
+skip_tags: true
diff --git a/circle.yml b/circle.yml
index b679179..352a164 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,17 +1,16 @@
 dependencies:
-  pre:
-    # Force updating wget due to the current containers being too out of date
-    - sudo apt-get update
-    - sudo apt-get install wget
   override:
-    - wget -O atom-amd64.deb https://atom.io/download/deb
-    # - sudo apt-get update # Cut out until wget is fixed on the containers
+    - curl -L https://atom.io/download/deb -o atom-amd64.deb
     - sudo dpkg --install atom-amd64.deb || true
+    - sudo apt-get update
     - sudo apt-get -f install
     - apm install
 test:
   override:
     - atom -v
     - apm -v
-    - npm test
     - apm test
+
+machine:
+  node:
+    version: 6.1.0

From eff269c5ab3b87fde7cf01d8434e8017ff5e9ef7 Mon Sep 17 00:00:00 2001
From: Landon Abney <Landonabney@gmail.com>
Date: Mon, 22 Aug 2016 14:22:00 -0700
Subject: [PATCH 2/2] Update to current CI configs

Uses the new flag to use the system Node.js to run the linters.
---
 .travis.yml  | 36 +++++++++++++++++++++++-------------
 appveyor.yml | 20 ++++++++++++++++----
 circle.yml   | 20 +++++++++-----------
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9159891..d940291 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,33 @@
-# Project specific config
-os:
-  - linux
-  - osx
+### Project specific config ###
+
+# Installed for linting the project
+language: node_js
+
+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:
   global:
     - APM_TEST_PACKAGES=""
+    - ATOM_LINT_WITH_BUNDLED_NODE="false"
 
-  matrix:
-    - ATOM_CHANNEL=stable
-    - ATOM_CHANNEL=beta
-
-# Installed for linting the project
-language: node_js
-node_js: "6"
-
-# Generic setup follows
+### Generic setup follows ###
 script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
 
+# Needed to disable the auto-install step running `npm install`
+install: true
+
 notifications:
   email:
     on_success: never
diff --git a/appveyor.yml b/appveyor.yml
index 637148e..3be532f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,15 +1,27 @@
+### Project specific config ###
+environment:
+  APM_TEST_PACKAGES:
+  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'))
 
-version: "{build}"
-platform: x64
 branches:
   only:
     - master
-test: off
-deploy: off
+
+version: "{build}"
+platform: x64
 clone_depth: 10
 skip_tags: true
+test: off
+deploy: off
diff --git a/circle.yml b/circle.yml
index 352a164..03bff51 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,16 +1,14 @@
-dependencies:
-  override:
-    - curl -L https://atom.io/download/deb -o atom-amd64.deb
-    - sudo dpkg --install atom-amd64.deb || true
-    - sudo apt-get update
-    - sudo apt-get -f install
-    - apm install
 test:
   override:
-    - atom -v
-    - apm -v
-    - apm test
+    - curl -Ls https://github.com/Arcanemagus/ci/raw/atomlinter/build-package.sh | sh
+
+dependencies:
+  override:
+    - echo "Managed in the script"
 
 machine:
   node:
-    version: 6.1.0
+    version: 6
+  environment:
+    ATOM_LINT_WITH_BUNDLED_NODE: "false"
+    APM_TEST_PACKAGES: ""