From a3e10d86f1a707c005931929ac27df762864fcc1 Mon Sep 17 00:00:00 2001 From: Bojan Rosko Date: Tue, 26 Nov 2024 12:35:34 +0000 Subject: [PATCH] Revert "Build ubench in CI (#305)" This reverts commit 59d5b51d4172189f93dbfcfce55f1613c4ec2ceb. --- .github/workflows/build-tests.yml | 6 +++--- tests/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml index 1ed36a85..3916e4bf 100644 --- a/.github/workflows/build-tests.yml +++ b/.github/workflows/build-tests.yml @@ -28,7 +28,7 @@ on: env: - BUILD_TARGETS: "umd_tests ubench" + BUILD_TARGET: umd_tests BUILD_OUTPUT_DIR: ./build LIB_OUTPUT_DIR: ./build/lib DEPS_OUTPUT_DIR: ./build/_deps @@ -62,11 +62,11 @@ jobs: submodules: recursive lfs: 'true' - - name: Build ${{ env.BUILD_TARGETS }} + - name: Build ${{ env.BUILD_TARGET }} run: | echo "Compiling the code..." cmake -B ${{ env.BUILD_OUTPUT_DIR }} -G Ninja -DTT_UMD_BUILD_TESTS=ON - cmake --build ${{ env.BUILD_OUTPUT_DIR }} --target ${{ env.BUILD_TARGETS }} + cmake --build ${{ env.BUILD_OUTPUT_DIR }} --target ${{ env.BUILD_TARGET }} echo "Compile complete." # This is needed to preserve file permissions diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5a6e1ee0..bbc47fcd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -58,7 +58,9 @@ else() include_directories("${CMAKE_CURRENT_BINARY_DIR}/$ENV{ARCH_NAME}") endif() -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/microbenchmark) +if(MASTER_PROJECT) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/microbenchmark) +endif() add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/api) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/pcie) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/misc)