Skip to content

Commit

Permalink
Updated per PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
couryrr-afs committed Feb 7, 2024
1 parent 3f3f7c2 commit 70980f5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
build/
dist/
workspace.yaml
dist/
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()

0 comments on commit 70980f5

Please sign in to comment.