X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dac53ac178503740854d6b42ccfb44833c7cd19c..e069d740e376914c9d639630e04898e28918f1ff:/.travis.yml?ds=sidebyside diff --git a/.travis.yml b/.travis.yml index 73739e90..14ce9b38 100644 --- 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