aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-10-11 17:51:46 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-10-11 17:51:46 +0200
commitd9adae46dae6e2176e8765368d2902cc24da688b (patch)
tree08ddf5e66f6f4ad7718e3e8d8ad6e9a0bb38616f /.travis.yml
parentdf6770894262a98a96fa2d153f87ee9499b9f64c (diff)
parent24126ab9bc6461761890f0213679ed9aaed48c87 (diff)
downloadlibnitrokey-d9adae46dae6e2176e8765368d2902cc24da688b.tar.gz
libnitrokey-d9adae46dae6e2176e8765368d2902cc24da688b.tar.bz2
Merge branch 'travis_update'
Use new xcode and GCC 7
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml19
1 files changed, 16 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index cd1c489..3b95345 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
language: generic
sudo: false
os: osx
-env: CF=
+env:
+ global:
+ - CF=-DCOMPILE_OFFLINE_TESTS=1
matrix:
include:
@@ -9,7 +11,7 @@ matrix:
# before_install: &brew
# - brew update
# - brew install hidapi
- - osx_image: xcode6.4
+ - osx_image: xcode9.1
- osx_image: xcode8.2
- os: linux
dist: trusty
@@ -34,6 +36,16 @@ matrix:
sources: *sources
- os: linux
dist: trusty
+ env: COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7
+ addons:
+ apt:
+ packages:
+ - cmake
+ - libhidapi-dev
+ - g++-7
+ sources: *sources
+ - os: linux
+ dist: trusty
env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8
addons:
apt:
@@ -55,4 +67,5 @@ install:
script:
- make -j2
- - ctest -VV \ No newline at end of file
+ - ctest -VV
+ - mkdir install && make install DESTDIR=install \ No newline at end of file