X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b44b9d90b7ad2ce89e3af993ec82d5d010f8da72..1a4b907335746ab94eb8bb78e2625c6f98584ac3:/.travis.yml diff --git a/.travis.yml b/.travis.yml index 3c45e9be..ea0a545c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,23 +19,20 @@ 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 ## 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 - - elif [ "$TRAVIS_OS_NAME" == "osx" ]; then - - brew update; - - brew tap iceman1001/proxmark3; - - brew install proxmark3; - fi -#make command + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'; 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; 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 + + #make command script: "make all" \ No newline at end of file