X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/82b94b65aa693ef93bda55d28aa63efce88a652c..dbbc82968c0565f2e84cc6a0a25a261da8b8deb3:/.travis.yml?ds=inline diff --git a/.travis.yml b/.travis.yml index 421a47ba..fd121e8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,24 @@ # Travis-CI Build for Iceman Fork / Proxmark3 language: c -# multi platform build test -os: - - linux - - osx +#default linux build env is: Ubuntu 14.04 trusty +dist: trusty +sudo: required #install: compiler: gcc +# multi platform build test # build matrix, # LINUX : Using trusty beta build environment, based on Ubuntu 14.04 # MAC OS: matrix: include: - - os: linux - dist: trusty - sudo: required - os: osx osx_image: xcode7.3 allow_failures: - os: osx - + # MAC OS - dependencies? before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi @@ -29,9 +26,9 @@ before_install: ## 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: - - 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 + - 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 #make command