X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4dc3a0325b1f2f0f96243dd82720432e15eba10b..cb53a16c0ea063210218f1382d9ccc20e1cafb30:/.travis.yml diff --git a/.travis.yml b/.travis.yml index a81e7eb8..c5de4790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,22 +20,22 @@ matrix: - 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 +#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: 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 + 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; + brew update; + brew tap iceman1001/proxmark3; + brew install proxmark3; fi #make command script: "make all" \ No newline at end of file