Merge pull request #352 from merlokk/travis_check_compiler

add check arm-none-eabi-gcc and unify install step for linux and macos
This commit is contained in:
Oleg Moiseenko 2019-08-22 13:45:08 +03:00 committed by GitHub
commit c1b03b7fc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -45,14 +45,14 @@ addons:
taps: RfidResearchGroup/proxmark3 taps: RfidResearchGroup/proxmark3
install: install:
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if ! arm-none-eabi-gcc -v; then
make clean; echo "arm-none-eabi-gcc [ERROR]";
make all V=1 "$MAKE_PARAMS"; travis_terminate 1;
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
make clean;
make all V=1 "$MAKE_PARAMS";
fi fi
make clean;
make all V=1 "$MAKE_PARAMS";
script: script:
## start and run a test script ## start and run a test script
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then