X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/fba624b803b6430a3762d02c204f8aefe74e1c43..d7d12fab4b8d1fc1e0c78af682ee50606e84bfbe:/.travis.yml?ds=inline diff --git a/.travis.yml b/.travis.yml index 9c4162c0..84b28a89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Travis-CI Build for Iceman Fork / Proxmark3 +# Travis-CI Build for IcemanFork/Proxmark3 language: c #default linux build env is: Ubuntu 14.04 trusty @@ -20,16 +20,22 @@ matrix: - os: osx # MAC OS - dependencies? -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; 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" ]]; sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; sudo apt-get update -qq; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; sudo apt-get install -y gcc-arm-none-eabi; fi + - 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 script: "make all" \ No newline at end of file