Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 665b6fd1c35fa119853c12cd8e7b6851e988f59d..ea0a545cf1d2fa1a2b926c341445d83d1aae11a3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Travis-CI Build for Iceman Fork / Proxmark3
+# Travis-CI Build for IcemanFork/Proxmark3

 language: c
 
 #default linux build env is: Ubuntu 14.04 trusty
 language: c
 
 #default linux build env is: Ubuntu 14.04 trusty


@@ -19,19 +19,20 @@ matrix:
   allow_failures:
     - os: osx
 
   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:
 ## 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:

-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; 
-   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;
-   fi
-   - 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
 script: "make all"
\ No newline at end of file