Merge pull request #1460 from washort/master

Run webpack on all branches
getredash · Dec 6, 2016 · c2f9e37 · c2f9e37
2 parents fcd623e + 20a0d95
commit c2f9e37
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/circle.yml b/circle.yml
@@ -12,8 +12,7 @@ dependencies:
     - pip install -r requirements_dev.txt
     - pip install -r requirements.txt
     - pip install pymongo==3.2.1
-    - if [ "$CIRCLE_BRANCH" = "master" ]; then make deps; fi
-    - if [ "$CIRCLE_BRANCH" = "webpack" ]; then make deps; fi
+    - make deps
   cache_directories:
     - node_modules/
     - client/node_modules/