From 2eda65945f05daacff449927659c6fdac5d412e6 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 4 Jan 2017 17:11:22 -0700
Subject: [PATCH] Simplify travis build

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index efb4c03..d8e9d69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ rust:
 cache: cargo
 os:
 - linux
-- osx
-matrix:
-  allow_failures:
-  - os: osx
+#- osx
+#matrix:
+#  allow_failures:
+#  - os: osx
 dist: trusty
 before_install:
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
@@ -26,7 +26,7 @@ before_install:
 script:
 - make clean &&
   make update &&
-  make build/harddrive.bin.gz build/livedisk.bin.gz build/livedisk.iso -j 2
+  make build/harddrive.bin.gz build/livedisk.bin.gz build/livedisk.iso
 notifications:
   email: false
   webhooks: http://37.139.9.28:54863/travis