From: iceman1001 Date: Mon, 23 Jan 2017 22:17:26 +0000 (+0100) Subject: chg: why?!? X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d8d5260e5c695672059cc690a69f5e6cba4dc72e chg: why?!? --- diff --git a/.travis.yml b/.travis.yml index 0b852d27..14ce9b38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,7 @@ 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 ## Install mainline ARM toolchain. gcc-arm-none-eabi is available @@ -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