diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ef77628..083a5cc 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -40,8 +40,6 @@ jobs: run: meson setup builddir -Db_coverage=true - name: build and test dist package run: ninja -C builddir dist - - name: run unit tests - run: ninja -C builddir test - name: calculate coverage run: ninja -C builddir coverage-text - name: Coverage report diff --git a/meson.build b/meson.build index 7f1a8b1..f959246 100644 --- a/meson.build +++ b/meson.build @@ -1,11 +1,11 @@ project( 'ptprnt', 'cpp', - version: 'v0.1.0-' + run_command( + version: 'v0.1.0-' + + run_command( 'git', 'rev-parse', - '--short', - 'HEAD', + '--short', 'HEAD', check: true, ).stdout().strip(), license: 'GPLv3', @@ -24,7 +24,7 @@ log_dep = dependency('spdlog') fmt_dep = dependency('fmt') pangocairo_dep = dependency('pangocairo') -# CLI11 +# CLI11 cli11_proj = subproject('cli11') cli11_dep = cli11_proj.get_variable('CLI11_dep') if not cli11_dep.found() @@ -41,7 +41,9 @@ cpp_args = ['-DPROJ_VERSION="' + meson.project_version() + '"'] # USB trace mode option (for debugging without sending to hardware) if get_option('usb_trace_only') cpp_args += ['-DUSB_TRACE_ONLY'] - message('USB_TRACE_ONLY enabled: USB data will be logged but not sent to device') + message( + 'USB_TRACE_ONLY enabled: USB data will be logged but not sent to device', + ) endif ptprnt_exe = executable( @@ -54,7 +56,6 @@ ptprnt_exe = executable( cpp_args: cpp_args, ) - ### Unit tests # GTest and GMock @@ -65,4 +66,4 @@ if not gtest_dep.found() error('MESON_SKIP_TEST: gtest not installed.') endif -subdir('tests') +subdir('tests') \ No newline at end of file