From: merlokk Date: Sat, 23 Dec 2017 22:28:38 +0000 (+0200) Subject: added xcode 9.2 and some logging X-Git-Tag: v3.1.0~86^2~4 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b1c0f020988313a286f45669dcc505e66533640c?hp=1e431c5d360fc1fde456c0dac3fb5c6085826aff added xcode 9.2 and some logging --- diff --git a/.travis.yml b/.travis.yml index 918240c7..8e9289b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ matrix: - os: osx osx_image: xcode8.3 # OS X 10.12 - os: osx - osx_image: xcode9 # OS X 10.13 + osx_image: xcode9 # OS X 10.12 - os: osx - osx_image: xcode9.1 # OS X 10.13.1 + osx_image: xcode9.2 # OS X 10.12 - os: linux dist: trusty sudo: required @@ -23,6 +23,7 @@ before_install: ## Install ARM toolchain on Linux. ## add our homebrew tap for MacOS ## Note: all dependencies on MacOS should be resolved by the brew install command + echo $REPOSITORY_EP; if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; sudo apt-get install -y gcc-arm-none-eabi; @@ -31,7 +32,7 @@ before_install: if [[ "$REPOSITORY_EP" == "" ]]; then brew tap proxmark/proxmark3; else - brew tap "$REPOSITORY_EP"; + brew tap "$REPOSITORY_EP" --env=std; fi fi diff --git a/travis_test_commands.scr b/travis_test_commands.scr index 0dba3526..4f5b025c 100644 --- a/travis_test_commands.scr +++ b/travis_test_commands.scr @@ -1,2 +1,3 @@ hf mf hardnested t 1 000000000000 +hf emv test exit