chg: travis ci again

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 421a47ba57be0fb7726fe95cf9bc2e3d40a67955..84b28a8932ed0e7596bfd1f2310b4c0c14340659 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,41 @@
-# 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.3
   allow_failures:
     - os: osx
-       
+
 # MAC OS - dependencies?
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+#before_install:
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
 
 ## 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
+  - if  [ "$TRAVIS_OS_NAME" = "linux" ]; then 
+  - 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
-
+  - elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 
+  - brew update;
+  - brew tap iceman1001/proxmark3;
+  - brew install proxmark3;
+  fi
 #make command
 script: "make all"
\ No newline at end of file