diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-13 22:45:39 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-13 22:45:39 +0200 |
| commit | d36b9d032d0f646c45e3d9d0dafcf19c79361b18 (patch) | |
| tree | e94a0bbdc07e242370c70436f0bf634bebc1d34d /.travis.yml | |
| parent | a616ac00c2cd0461d98d49b7a240ec4b73111c7d (diff) | |
| parent | 9849224e27c3c82e2f4efb6e491b6975bb4ecb25 (diff) | |
| download | libnitrokey-d36b9d032d0f646c45e3d9d0dafcf19c79361b18.tar.gz libnitrokey-d36b9d032d0f646c45e3d9d0dafcf19c79361b18.tar.bz2 | |
Merge branch 'master' into meson
Update to latest
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index 6bf5438..52a10e3 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 @@ -22,50 +18,67 @@ matrix: - cmake - libhidapi-dev - g++-5 - - python3 - - python3-pip - - python3-requests - - git sources: &sources - ubuntu-toolchain-r-test + - 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: bionic + env: COMPILER_NAME=gcc CXX=g++-10 CC=gcc-10 + addons: + apt: + packages: + - cmake + - libhidapi-dev + - g++-10 + - python3 + - python3-pip + sources: *sources script: - make -j2 - ctest -VV - mkdir install && make install DESTDIR=install - - pip3 install pytest --user - cd ../ - - pip3 install -r unittest/requirements.txt --user + - python3 -m pip install -r unittest/requirements.txt --user - 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=clang CXX=clang++-3.8 CC=clang-3.8 addons: apt: packages: - cmake - libhidapi-dev - - g++-6 + - g++-5 + - clang-3.8 sources: *sources - os: linux - dist: trusty - env: COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7 + dist: bionic + env: COMPILER_NAME=clang CXX=clang++-6.0 CC=clang-6.0 addons: apt: packages: - cmake - libhidapi-dev - - g++-7 + - clang-6.0 sources: *sources - os: linux - dist: trusty - env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 + dist: bionic + env: COMPILER_NAME=clang CXX=clang++-9 CC=clang-9 addons: apt: packages: - cmake - libhidapi-dev - - g++-5 - - clang-3.8 + - clang-9 sources: *sources |