From 9a21bf8b2d8a77233f29fdd62a8c23974ee0c069 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Thu, 22 Aug 2019 13:26:05 +0300 Subject: [PATCH 1/2] add check arm-none-eabi-gcc and unify install step for linux and macos --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8952df259..0b108b4f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,13 +45,13 @@ addons: taps: RfidResearchGroup/proxmark3 install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - make clean; - make all V=1 "$MAKE_PARAMS"; - elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - make clean; - make all V=1 "$MAKE_PARAMS"; + if ! arm-none-eabi-gccx -v; then + echo "arm-none-eabi-gcc [ERROR]"; + travis_terminate 1; fi + + make clean; + make all V=1 "$MAKE_PARAMS"; script: ## start and run a test script From 34a389a4ac45ad56c94f439a458efe6f51a228c7 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Thu, 22 Aug 2019 13:30:01 +0300 Subject: [PATCH 2/2] small fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b108b4f1..ac39433f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ addons: taps: RfidResearchGroup/proxmark3 install: - if ! arm-none-eabi-gccx -v; then + if ! arm-none-eabi-gcc -v; then echo "arm-none-eabi-gcc [ERROR]"; travis_terminate 1; fi