chg: travis ci again

This commit is contained in:
iceman1001 2017-01-23 20:59:19 +01:00
commit cb53a16c0e

View file

@ -20,22 +20,22 @@ matrix:
- os: osx - os: osx
# MAC OS - dependencies? # MAC OS - dependencies?
before_install: #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 # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
## Install mainline ARM toolchain. gcc-arm-none-eabi is available ## Install mainline ARM toolchain. gcc-arm-none-eabi is available
## in Ubuntu >= 14.04, but this external PPA is needed for 12.04. ## in Ubuntu >= 14.04, but this external PPA is needed for 12.04.
before_script: before_script:
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
- sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'; sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted';
- sudo apt-get update -qq; sudo apt-get update -qq;
- sudo apt-get install -y gcc-arm-none-eabi; sudo apt-get install -y gcc-arm-none-eabi;
- git fetch --all git fetch --all
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
- brew update; brew update;
- brew tap iceman1001/proxmark3; brew tap iceman1001/proxmark3;
- brew install proxmark3; brew install proxmark3;
fi fi
#make command #make command
script: "make all" script: "make all"