FIX: 'lf hitag2' forgot to add some of @marshmellow42 's changes. Lf search should...

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 421a47ba57be0fb7726fe95cf9bc2e3d40a67955..fd121e8afef96666f690e12c8354c8f76b2eb443 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,24 @@
 # Travis-CI Build for Iceman Fork / Proxmark3
 language: c
 
 # 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
 
 
 #install:
 compiler: gcc
 

+# multi platform build test

 # build matrix,  
 # LINUX : Using trusty beta build environment,  based on Ubuntu 14.04
 # MAC OS: 
 matrix:
   include:
 # 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
     - os: osx
       osx_image: xcode7.3
   allow_failures:
     - os: osx

-       
+

 # MAC OS - dependencies?
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
 # 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:
 ## 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
   - git fetch --all
 
 #make command