CHG: @Marshmellow42 's fixes. ref: https://github.com/marshmellow42/proxmark3/commi...

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 0b852d27f65fc6c2c44953c0dbebc0beade60d2b..ea0a545cf1d2fa1a2b926c341445d83d1aae11a3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,7 @@ matrix:
   allow_failures:
     - os: osx
 
   allow_failures:
     - os: osx
 

-# MAC OS - dependencies?

 #before_install:
 #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
   
   
 ## Install mainline ARM toolchain.  gcc-arm-none-eabi is available


@@ -32,7 +29,10 @@ 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" == "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 install perl; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi

   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install 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