diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-15 09:21:00 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-15 09:21:00 +0200 |
| commit | 89a73d88c9026b6347bea113896d24e419c4370c (patch) | |
| tree | 57df3a3ce2e8f7b6b8df08045939d9c35b8aad7a | |
| parent | ed9552d731161ee36a7df025d2f0186ae500d01e (diff) | |
| parent | d9b78c36457071d9b2d585a0da753200a495bbf9 (diff) | |
| download | libnitrokey-89a73d88c9026b6347bea113896d24e419c4370c.tar.gz libnitrokey-89a73d88c9026b6347bea113896d24e419c4370c.tar.bz2 | |
Merge branch 'CI-cleanup-2'
CI: correct Meson builds
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 579796e..6f3cec0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,8 @@ matrix: - g++-10 - python3 - python3-pip + - meson + - ninja-build sources: *sources script: - make -j2 @@ -49,20 +51,9 @@ matrix: - cd ../ - python3 -m pip install -r unittest/requirements.txt --user - cd unittest && python3 -m pytest -sv test_offline.py - - os: linux - dist: bionic - env: COMPILER_NAME=gcc CXX=g++-10 CC=gcc-10 - addons: - apt: - packages: - - meson - - ninja - - libhidapi-dev - - g++-10 - sources: *sources - script: - - mkdir build && meson build - - cd build && ninja + - cd ../ + - mkdir -p build-meson && meson build-meson + - cd build-meson && ninja - env DESTDIR=install ninja install - os: linux dist: trusty |