From: pwpiwi Date: Thu, 9 Apr 2020 07:19:25 +0000 (+0200) Subject: update CI/.travis.yml (#929) X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c85805b8a2e96f2d66a4728abe14053436e36068 update CI/.travis.yml (#929) * drop checks for MacOS 10.11 and 10.12 * add checks for Ubuntu 16.04 and 18.04 * add libnewlib-arm-none-eabi as prerequisite on Ubuntu --- diff --git a/CI/.travis.yml b/CI/.travis.yml index 0c02c250..01dd168a 100644 --- a/CI/.travis.yml +++ b/CI/.travis.yml @@ -1,23 +1,28 @@ # Travis-CI config # variable REPOSITORY_EP must be filled with repository name. as sample: "merlokk/proxmark3" + language: c compiler: gcc # Test on Linux and MacOS -matrix: +jobs: include: - - os: osx - osx_image: xcode7.3 # OS X 10.11 - - os: osx - osx_image: xcode8.3 # OS X 10.12 - os: osx osx_image: xcode9.4 # OS X 10.13 - os: osx osx_image: xcode10 # OS X 10.13 + - os: osx + osx_image: xcode11 # OS X 10.14 - os: linux - dist: trusty - sudo: required + dist: trusty # Ubuntu 14.04 + - os: linux + dist: xenial # Ubuntu 16.04 + - os: linux + dist: bionic # Ubuntu 18.04 + +git: + depth: false before_install: ## Install ARM toolchain on Linux. @@ -26,13 +31,13 @@ before_install: echo $REPOSITORY_EP; if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; - sudo apt-get install -y gcc-arm-none-eabi libpcsclite-dev; + sudo apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi libpcsclite-dev; elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; if [[ "$REPOSITORY_EP" == "" ]]; then - brew tap proxmark/proxmark3; + brew tap --full proxmark/proxmark3; else - brew tap "$REPOSITORY_EP" --env=std; + brew tap --full "$REPOSITORY_EP" --env=std; fi fi @@ -47,7 +52,7 @@ install: before_script: script: -## for the time being we are satisfied if it can be build and then successfully started +## for the time being we are satisfied if it can be build and hf mf hardnested runs if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then proxmark3 /dev/notexists travis_test_commands.scr ; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then