diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-13 23:01:18 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2020-06-13 23:01:18 +0200 |
| commit | ed9552d731161ee36a7df025d2f0186ae500d01e (patch) | |
| tree | 1cb1d5a8e745ba0f9531c4e6a6f49a5f0e4e4209 | |
| parent | 9849224e27c3c82e2f4efb6e491b6975bb4ecb25 (diff) | |
| parent | 03a0764bb1546b504fa9e47ccf5197afa96075e9 (diff) | |
| download | libnitrokey-ed9552d731161ee36a7df025d2f0186ae500d01e.tar.gz libnitrokey-ed9552d731161ee36a7df025d2f0186ae500d01e.tar.bz2 | |
Merge branch 'meson'
Update Meson build script
Add CI job to test build
Fixes #165
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | meson.build | 18 |
2 files changed, 26 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 52a10e3..579796e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,21 @@ matrix: - 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 + - env DESTDIR=install ninja install + - os: linux dist: trusty env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 addons: diff --git a/meson.build b/meson.build index 600be6d..c758a7a 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'libnitrokey', 'cpp', - version : '3.4.1', + version : '3.5.0', license : 'LGPL-3.0+', default_options : [ 'cpp_std=c++14' @@ -150,12 +150,16 @@ if get_option('offline-tests') endif if get_option('tests') tests += [ - ['test_C_API', 'test_C_API.cpp'], - ['test1', 'test1.cc'], - ['test2', 'test2.cc'], - ['test3', 'test3.cc'], - ['test_HOTP', 'test_HOTP.cc'], - ['test_issues', 'test_issues.cc'], + ['test_C_API', 'test_C_API.cpp'], + ['test1', 'test1.cc'], + ['test2', 'test2.cc'], + ['test3', 'test3.cc'], + ['test_HOTP', 'test_HOTP.cc'], + ['test_memory', 'test_memory.c'], + ['test_issues', 'test_issues.cc'], + ['test_multiple_devices', 'test_multiple_devices.cc'], + ['test_strdup', 'test_strdup.cpp'], + ['test_safe', 'test_safe.cpp'], ] endif foreach tst : tests |