From 24fdcd777d0144e00038aad3a572c5922e9de710 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Jun 2020 18:08:06 +0200 Subject: Update build configurations --- .travis.yml | 36 ++++++++++++++++++++++++++---------- 1 file 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: -- cgit v1.2.1 From dc234d158f27a5aa385c80daa63365b3c5472944 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Jun 2020 18:23:27 +0200 Subject: Move offline Python tests call to newer Ubuntu --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 703a4bb..0ad1575 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,14 +24,6 @@ matrix: - git sources: &sources - ubuntu-toolchain-r-test - script: - - make -j2 - - ctest -VV - - mkdir install && make install DESTDIR=install - - pip3 install pytest --user - - cd ../ - - pip3 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++-7 CC=gcc-7 @@ -52,6 +44,14 @@ matrix: - libhidapi-dev - g++-10 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 + - cd unittest && python3 -m pytest -sv test_offline.py - os: linux dist: trusty env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 -- cgit v1.2.1 From f3cffe7245f25d6a8b0651987a9e412c374027e9 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Jun 2020 18:29:58 +0200 Subject: Make proper call to install pip package --- .travis.yml | 9 +++------ unittest/requirements.txt | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ad1575..52a10e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,6 @@ matrix: - cmake - libhidapi-dev - g++-5 - - python3 - - python3-pip - - python3-requests - - git sources: &sources - ubuntu-toolchain-r-test - os: linux @@ -43,14 +39,15 @@ matrix: - 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 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 -- cgit v1.2.1