X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/755c72b798438b795aa15688b9a3d5ac92487818..6b882a3918590b9c0f45643323adae9862eedde5:/.travis.yml?ds=sidebyside diff --git a/.travis.yml b/.travis.yml index b52d1f65..f5fed7a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ matrix: - os: osx osx_image: xcode7.3 # OS X 10.11 - os: osx - osx_image: xcode8 # OS X 10.11 + osx_image: xcode8.3 # OS X 10.12 - os: osx - osx_image: xcode8.1 # OS X 10.12 + osx_image: xcode9.4 # OS X 10.13 - os: osx - osx_image: xcode8.3 # OS X 10.12 + osx_image: xcode10 # OS X 10.13 - os: linux dist: trusty sudo: required @@ -23,16 +23,22 @@ 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; elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; - brew tap "$REPOSITORY_EP"; + if [[ "$REPOSITORY_EP" == "" ]]; then + brew tap proxmark/proxmark3; + else + brew tap "$REPOSITORY_EP" --env=std; + fi fi install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew info proxmark3; brew install -v --HEAD proxmark3; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make all;