From: iceman1001 Date: Mon, 23 Jan 2017 22:11:22 +0000 (+0100) Subject: CHG: will this also please Travis CI priests? X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/dac53ac178503740854d6b42ccfb44833c7cd19c?hp=d04dbd0c373191ec30fbe4a32b72d1b245b36d08 CHG: will this also please Travis CI priests? --- diff --git a/.travis.yml b/.travis.yml index 8bd8c1a7..73739e90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ matrix: #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. before_script: @@ -31,8 +32,7 @@ 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; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi +# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew tap iceman1001/proxmark3; brew install proxmark3; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install proxmark3; fi #make command script: "make all" \ No newline at end of file