X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a72971eb8cd0c6524b938ceb5d297efaebacffd6..57e1e31dce70a58da1736b9579a869c1df313a13:/.travis.yml?ds=inline

diff --git a/.travis.yml b/.travis.yml
index a45f98dd..ea0a545c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,38 @@
-# Travis-CI Build for Iceman Fork / Proxmark3
+# Travis-CI Build for IcemanFork/Proxmark3
 language: c
 
-# multi platform build test
-os:
-  - linux
-  - osx
+#default linux build env is: Ubuntu 14.04 trusty
+dist: trusty
+sudo: required
 
 #install:
 compiler: gcc
 
+# multi platform build test
 # build matrix,  
 # LINUX : Using trusty beta build environment,  based on Ubuntu 14.04
 # MAC OS: 
 matrix:
   include:
-    - os: linux
-      dist: trusty
-      sudo: required
     - os: osx
-      osx_image: xcode7.2
+      osx_image: xcode7.3
   allow_failures:
     - os: osx
-	
-# MAC OS - dependencies?
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
 
+#before_install:
+  
+  
 ## Install mainline ARM toolchain.  gcc-arm-none-eabi is available
 ## in Ubuntu >= 14.04, but this external PPA is needed for 12.04.
 before_script:
-  - sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'
-  - sudo apt-get update -qq
-  - sudo apt-get install -y gcc-arm-none-eabi
-  - git fetch --all
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y gcc-arm-none-eabi; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git fetch --all; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install perl; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install proxmark3; fi
 
-#make command
+  #make command
 script: "make all"
\ No newline at end of file