FIX: "hf legic write" - removed a warning message and made the overwrite question...

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6bbc62fcee65637a222301b303f54aae3b5248ae..8db379a2250975af9d16549ad25d91d77f9a4762 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,38 @@
 # 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
+

 #install:
 compiler: gcc
 
 #install:
 compiler: gcc
 

+# 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
+

 ## 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
 ## 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

+  - git fetch --all

 
 

-  #make command
-script: make clean && make all UBUNTU_1404_QT4=1
\ No newline at end of file
+#make command
+script: "make all"
\ No newline at end of file