From 70980f5bc34aa12ef8ea9e80226bf37a73ff74d6 Mon Sep 17 00:00:00 2001 From: Coury Richards <146002925+couryrr-afs@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:12:09 +0000 Subject: [PATCH] Updated per PR comments --- .github/workflows/build_and_test.yaml | 12 +++++++++--- .gitignore | 3 +-- CMakeLists.txt | 5 +++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 3d93c4f..0d2c83d 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -1,4 +1,4 @@ -See also https://github.com/EVerest/everest-core/tree/main/.github/workflows +# See also https://github.com/EVerest/everest-core/tree/main/.github/workflows # TODO: modify to reuse the above workflow to DRY up CI. name: Build and test libtimer @@ -18,7 +18,10 @@ on: jobs: lint: name: Lint - runs-on: ${{ matrix.os }}](runs-on: ${{ inputs.runner || 'ubuntu-22.04' }}) + strategy: + matrix: + os: [ubuntu-22.04] + runs-on: ${{ matrix.os }} steps: - name: Checkout libtimer uses: actions/checkout@v3 @@ -32,7 +35,10 @@ jobs: exclude: cache install_and_test: name: Install and test - runs-on: ${{ inputs.runner || 'ubuntu-22.04' }} + strategy: + matrix: + os: [ubuntu-22.04] + runs-on: ${{ matrix.os }} steps: - name: Checkout libtimer uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index 60e135d..5df9179 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ build/ -dist/ -workspace.yaml \ No newline at end of file +dist/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index fbd3c1b..6c7fba9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ find_package(everest-cmake 0.1 REQUIRED ) # options -option(${PROJECT_NAME}_BUILD_TESTING "Build unit tests, used if included as dependency" ON) -option(BUILD_TESTING "Build unit tests, used if standalone project" ON) +option(${PROJECT_NAME}_BUILD_TESTING "Build unit tests, used if included as dependency" OFF) +option(BUILD_TESTING "Build unit tests, used if standalone project" OFF) option(BUILD_EXAMPLES "Build examples" OFF) option(TIMER_INSTALL "Install the library (shared data might be installed anyway)" ${EVC_MAIN_PROJECT}) option(CMAKE_RUN_CLANG_TIDY "Run clang-tidy" OFF) @@ -88,5 +88,6 @@ endif() if((${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME} OR ${PROJECT_NAME}_BUILD_TESTING) AND BUILD_TESTING) include(CTest) + enable_testing() add_subdirectory(tests) endif()