Merge pull request #158 from convox/fix-ci

fix circle
convox · Nov 10, 2015 · a813df4 · a813df4
2 parents 7b32988 + 6954825
commit a813df4
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/circle.yml b/circle.yml
@@ -4,16 +4,17 @@ machine:
 
 dependencies:
   pre:
-    - >
-      [ -n "${RUN_AWS}" ] && ci/dependencies-pre.sh || true
+    - ci/dependencies-pre.sh
 
 test:
   pre:
-    - >
-      [ -n "${RUN_AWS}" ] && ci/test-pre.sh || true
+    - ci/test-pre.sh
   override:
-    - >
-      [ -n "${RUN_AWS}" ] && ci/tests/create-httpd.sh || true
+    - ci/tests/create-httpd.sh
   post:
-    - >
-      [ -n "${RUN_AWS}" ] && ci/test-post.sh || true
+    - ci/test-post.sh
+
+general:
+  branches:
+     only:
+       - master