Merge pull request #926 from pwpiwi/fix_iso15693_fpga

[proxmark3-svn] / CI / .travis.yml

diff --git a/CI/.travis.yml b/CI/.travis.yml
index 8e9289b1908d18294cd52edec231d0be711043dd..01dd168ae9a3be35097685582101bfa46cd4e076 100644 (file)
--- 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
+      osx_image: xcode9.4   # OS X 10.13
     - os: osx
-      osx_image: xcode9     # OS X 10.12
+      osx_image: xcode10    # OS X 10.13
     - os: osx
-      osx_image: xcode9.2   # OS X 10.12
+      osx_image: xcode11    # OS X 10.14
+    - os: linux
+      dist: trusty          # Ubuntu 14.04
     - os: linux
-      dist: trusty
-      sudo: required
+      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;
+    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