From 55659cde27a257a037ec23ebd2c3b6194c18e3d9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 6 Nov 2016 17:10:00 -0700 Subject: [PATCH] Update .travis.yml --- .travis.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13463b8..becae9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,27 +4,25 @@ rust: - nightly os: - linux - - osx +# - osx dist: trusty before_install: - - if [ `uname` = "Darwin" ]; then - brew update; - brew install make nasm qemu gcc49 pkg-config Caskroom/cask/osxfuse; - brew tap glendc/gcc_cross_compilers; - brew install glendc/gcc_cross_compilers/x64-elf-binutils glendc/gcc_cross_compilers/x64-elf-gcc; - fi - if [ `uname` = "Linux" ]; then sudo apt-get install -qq nasm pkg-config fuse libfuse-dev; sudo modprobe fuse; sudo chmod 666 /dev/fuse; sudo chown root:$USER /etc/fuse.conf; fi + - if [ `uname` = "Darwin" ]; then + brew update; + brew install nasm gcc49 pkg-config Caskroom/cask/osxfuse; + brew tap glendc/gcc_cross_compilers; + brew install glendc/gcc_cross_compilers/x64-elf-binutils glendc/gcc_cross_compilers/x64-elf-gcc; + fi script: - make clean - - make all -j 3 + - make all -j 2 notifications: email: false webhooks: http://37.139.9.28:54863/travis -#branches: -# only: -# - auto +