From 6efc679b9e26e620ba801990ebc8d0b446d8bc68 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Wed, 14 Mar 2018 11:23:03 -0700
Subject: [PATCH] Update circle config to build all branches

And move submodule update into run, since in checkout it doesn't seem to run
---
 .circleci/config.yml | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c153a6e81e1..a25c2e07c88 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,21 +1,10 @@
-defaultFilters: &defaultFilters
-  filters:
-    branches:
-      only:
-        - master
-        - release-2.5
-        - release-2.6
-        - release-2.7
 workflows:
   version: 2
   main:
     jobs:
-      - node9:
-          <<: *defaultFilters
-      - node8:
-          <<: *defaultFilters
-      - node6:
-          <<: *defaultFilters
+      - node9
+      - node8
+      - node6
   nightly:
     triggers:
       - schedule:
@@ -25,13 +14,10 @@ workflows:
               only: master
     jobs:
       - node9:
-          <<: *defaultFilters
           context: nightlies
       - node8:
-          <<: *defaultFilters
           context: nightlies
       - node6:
-          <<: *defaultFilters
           context: nightlies
 
 base: &base
@@ -39,10 +25,9 @@ base: &base
     - workerCount: 4
     - timeout: 400000
   steps:
-    - checkout:
-        post:
-          - git submodule update --init --recursive
+    - checkout
     - run: |
+        git submodule update --init --recursive
         npm uninstall typescript --no-save
         npm uninstall tslint --no-save
         npm install