chg: new offering to Travis CI

[proxmark3-svn] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 3c45e9be43990462cd892f082244767f5395443a..0b852d27f65fc6c2c44953c0dbebc0beade60d2b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,21 +21,18 @@ matrix:
 
 # MAC OS - dependencies?
 #before_install:
 
 # MAC OS - dependencies?
 #before_install:

-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
-
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; 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:
 ## 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';
-  - sudo apt-get update -qq;
-  - sudo apt-get install -y gcc-arm-none-eabi;
-  - git fetch --all
-  - elif [ "$TRAVIS_OS_NAME" == "osx" ]; then 
-  - brew update;
-  - brew tap iceman1001/proxmark3;
-  - brew install proxmark3;
-  fi
+  - 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; brew tap iceman1001/proxmark3; brew install proxmark3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install proxmark3; fi

 #make command
 script: "make all"
\ No newline at end of file
 #make command
 script: "make all"
\ No newline at end of file