From 4dc3a0325b1f2f0f96243dd82720432e15eba10b Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 23 Jan 2017 20:55:27 +0100 Subject: [PATCH] CHG: trying to add OSX for Travis CI --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd121e8a..a81e7eb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Travis-CI Build for Iceman Fork / Proxmark3 +# Travis-CI Build for IcemanFork/Proxmark3 language: c #default linux build env is: Ubuntu 14.04 trusty @@ -21,15 +21,21 @@ matrix: # MAC OS - dependencies? before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; 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: + 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 #make command script: "make all" \ No newline at end of file -- 2.39.2