From cb53a16c0ea063210218f1382d9ccc20e1cafb30 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 23 Jan 2017 20:59:19 +0100
Subject: [PATCH 1/1] chg: travis ci again
---
.travis.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a81e7eb8..c5de4790 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,22 +20,22 @@ matrix:
- os: osx
# 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
+#before_install:
+# - 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
+ 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;
+ brew update;
+ brew tap iceman1001/proxmark3;
+ brew install proxmark3;
fi
#make command
script: "make all"
\ No newline at end of file
--
2.39.5