Skip to content

Commit

Permalink
Merge branch 'travis_update'
Browse files Browse the repository at this point in the history
Use new xcode and GCC 7
  • Loading branch information
szszszsz committed Oct 11, 2017
2 parents df67708 + 24126ab commit d9adae4
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
language: generic
sudo: false
os: osx
env: CF=
env:
global:
- CF=-DCOMPILE_OFFLINE_TESTS=1

matrix:
include:
# - osx_image: xcode7.3 #default
# before_install: &brew
# - brew update
# - brew install hidapi
- osx_image: xcode6.4
- osx_image: xcode9.1
- osx_image: xcode8.2
- os: linux
dist: trusty
Expand All @@ -32,6 +34,16 @@ matrix:
- libhidapi-dev
- g++-6
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
Expand All @@ -55,4 +67,5 @@ install:

script:
- make -j2
- ctest -VV
- ctest -VV
- mkdir install && make install DESTDIR=install

0 comments on commit d9adae4

Please sign in to comment.