still wrong...

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 73739e9089c4ddb0067f96d51b1fa8597ffec208..14ce9b3838e3ed711b951c1bbf8713df1c710c55 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,8 @@ matrix:
   allow_failures:
     - os: osx
 
-# MAC OS - dependencies?
 #before_install:
-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; 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.
@@ -32,7 +29,9 @@ before_script:
   - 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; brew tap iceman1001/proxmark3; brew install proxmark3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; 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