diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-13 18:44:23 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-13 18:44:23 +0200 |
| commit | e0f58556806ecde0a1ea3f1b306cb039cab00fc5 (patch) | |
| tree | 084a01f54eb64519a07037bb09202dad8925aadc | |
| parent | 8487b7d90b6eb31e2768d928155974462412868f (diff) | |
| parent | f3cffe7245f25d6a8b0651987a9e412c374027e9 (diff) | |
| download | libnitrokey-e0f58556806ecde0a1ea3f1b306cb039cab00fc5.tar.gz libnitrokey-e0f58556806ecde0a1ea3f1b306cb039cab00fc5.tar.bz2 | |
Merge branch 'CI-cleanup'
Update CI settings
Add new compilers and use Ubuntu 18.04
| -rw-r--r-- | .travis.yml | 53 | ||||
| -rw-r--r-- | unittest/requirements.txt | 1 |
2 files changed, 34 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 diff --git a/unittest/requirements.txt b/unittest/requirements.txt index 6d718ad..d8a7e29 100644 --- a/unittest/requirements.txt +++ b/unittest/requirements.txt @@ -1,4 +1,5 @@ cffi +pytest pytest-repeat pytest-randomly tqdm |