X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3881c53b6df592e8e0d05ce4ceecdfe2e4a9b3d6..7898d3b55f95c9af2fc049b9cae1bbf86b1dd739:/.travis.yml?ds=sidebyside diff --git a/.travis.yml b/.travis.yml index 021895d6..fd121e8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ # Travis-CI Build for Iceman Fork / Proxmark3 language: c +#default linux build env is: Ubuntu 14.04 trusty +dist: trusty +sudo: required + #install: compiler: gcc @@ -10,9 +14,6 @@ compiler: gcc # MAC OS: matrix: include: - - os: linux - dist: trusty - sudo: required - os: osx osx_image: xcode7.3 allow_failures: @@ -25,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