aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2020-06-13 18:08:06 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2020-06-13 18:08:06 +0200
commit24fdcd777d0144e00038aad3a572c5922e9de710 (patch)
tree173045db34fa1a1cdebc728dfc6e7e0092d09f24
parent8487b7d90b6eb31e2768d928155974462412868f (diff)
downloadlibnitrokey-24fdcd777d0144e00038aad3a572c5922e9de710.tar.gz
libnitrokey-24fdcd777d0144e00038aad3a572c5922e9de710.tar.bz2
Update build configurations
-rw-r--r--.travis.yml36
1 files changed, 26 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 6bf5438..703a4bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,8 @@ env:
matrix:
include:
-# - osx_image: xcode7.3 #default
-# before_install: &brew
-# - brew update
-# - brew install hidapi
+ - osx_image: xcode11.5
- osx_image: xcode9.1
- - osx_image: xcode8.2
- os: linux
dist: trusty
env: COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5
@@ -38,23 +34,23 @@ matrix:
- cd unittest && python3 -m pytest -sv test_offline.py
- os: linux
dist: trusty
- env: COMPILER_NAME=gcc CXX=g++-6 CC=gcc-6
+ env: COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7
addons:
apt:
packages:
- cmake
- libhidapi-dev
- - g++-6
+ - g++-7
sources: *sources
- os: linux
- dist: trusty
- env: COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7
+ dist: bionic
+ env: COMPILER_NAME=gcc CXX=g++-10 CC=gcc-10
addons:
apt:
packages:
- cmake
- libhidapi-dev
- - g++-7
+ - g++-10
sources: *sources
- os: linux
dist: trusty
@@ -67,6 +63,26 @@ matrix:
- g++-5
- clang-3.8
sources: *sources
+ - os: linux
+ dist: bionic
+ env: COMPILER_NAME=clang CXX=clang++-6.0 CC=clang-6.0
+ addons:
+ apt:
+ packages:
+ - cmake
+ - libhidapi-dev
+ - clang-6.0
+ sources: *sources
+ - os: linux
+ dist: bionic
+ env: COMPILER_NAME=clang CXX=clang++-9 CC=clang-9
+ addons:
+ apt:
+ packages:
+ - cmake
+ - libhidapi-dev
+ - clang-9
+ sources: *sources
install: