CHG: some minor changes from @marshmellow42

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 53628b477175ddbee501be790f950461cc715276..ea0a545cf1d2fa1a2b926c341445d83d1aae11a3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,38 @@
-# Travis-CI Build for Iceman Fork / Proxmark3
+# Travis-CI Build for IcemanFork/Proxmark3

 language: c
 language: c

+
+#default linux build env is: Ubuntu 14.04 trusty
+dist: trusty
+sudo: required
+

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

-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.
-  ## Install srecord
-  - if [ ${BUILD_ARCH:-0} = arm-aapcs ] ; then
-      sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded &&
-      sudo apt-get -qq update &&
-      sudo apt-get -qq install gcc-arm-none-eabi srecord &&
-      arm-none-eabi-gcc --version ;
-    fi
-       
-script: make clean && make all UBUNTU_1404_QT4=1
\ No newline at end of file
+# multi platform build test
+# build matrix,  
+# LINUX : Using trusty beta build environment,  based on Ubuntu 14.04
+# MAC OS: 
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode7.3
+  allow_failures:
+    - os: osx
+
+#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:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y gcc-arm-none-eabi; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git fetch --all; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install perl; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install proxmark3; fi
+
+  #make command
+script: "make all"
\ No newline at end of file