X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b0c73387f0cd76d921ea2102a63462aad66008e8..27d06e044795c0b0ea4d34b10bccfa41d57f77fc:/.travis.yml?ds=sidebyside diff --git a/.travis.yml b/.travis.yml index 94030db5..f5fed7a6 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.4 # OS X 10.13 - os: osx - osx_image: xcode9.1 # OS X 10.13.1 + osx_image: xcode10 # OS X 10.13 - os: linux dist: trusty sudo: required @@ -23,16 +23,17 @@ 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; - if [[ "$REPOSITORY_EP" == "" ]]; then + if [[ "$REPOSITORY_EP" == "" ]]; then brew tap proxmark/proxmark3; - else - brew tap "$REPOSITORY_EP"; - fi + else + brew tap "$REPOSITORY_EP" --env=std; + fi fi install: