Attempting to fix CI

Chowdhury-DSP · Oct 15, 2024 · a155ccc · a155ccc
1 parent a3b2626
commit a155ccc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build_and_test:
-    name: Build/Test plugin on ${{ matrix.name }}
+    name: Benchmark library on ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false # show all errors for each platform (vs. cancel jobs on error)
@@ -42,11 +42,9 @@ jobs:
           sudo apt install clang-15 -y
 
       - name: Install Ninja
-        if: runner.os == 'Linux' || runner.os == 'Windows'
         uses: seanmiddleditch/gha-setup-ninja@master
 
       - name: Get latest CMake
-        if: runner.os == 'Linux' || runner.os == 'Windows'
         uses: lukka/get-cmake@latest
 
       - uses: rui314/setup-mold@v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build_and_test:
-    name: Build/Test plugin on ${{ matrix.name }}
+    name: Test library on ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false # show all errors for each platform (vs. cancel jobs on error)
@@ -42,11 +42,9 @@ jobs:
           sudo apt install clang-15 -y
 
       - name: Install Ninja
-        if: runner.os == 'Linux' || runner.os == 'Windows'
         uses: seanmiddleditch/gha-setup-ninja@master
 
       - name: Get latest CMake
-        if: runner.os == 'Linux' || runner.os == 'Windows'
         uses: lukka/get-cmake@latest
 
       - uses: rui314/setup-mold@v1

diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
@@ -1,6 +1,6 @@
 message(STATUS "chowdsp_fft -- Configuring benchmarks ${CMAKE_BINARY_DIR}/_deps/pffft-src")
 
-add_executable(bench_chowsdp_fft bench.cpp)
-target_link_libraries(bench_chowsdp_fft PRIVATE chowdsp_fft)
-target_include_directories(bench_chowsdp_fft PRIVATE ${CMAKE_BINARY_DIR}/_deps/pffft-src)
-target_compile_definitions(bench_chowsdp_fft PRIVATE _USE_MATH_DEFINES=1)
+add_executable(bench_chowdsp_fft bench.cpp)
+target_link_libraries(bench_chowdsp_fft PRIVATE chowdsp_fft)
+target_include_directories(bench_chowdsp_fft PRIVATE ${CMAKE_BINARY_DIR}/_deps/pffft-src)
+target_compile_definitions(bench_chowdsp_fft PRIVATE _USE_MATH_DEFINES=1)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,12 +5,12 @@ CPMAddPackage("gh:catchorg/[email protected]")
 include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
 CPMAddPackage("bb:jpommier/pffft#fbc4058602803f40dc554b8a5d2bcc694c005f2f")
 
-add_executable(test_chowsdp_fft_cpp test.cpp ${pffft_SOURCE_DIR}/pffft.c)
-target_link_libraries(test_chowsdp_fft_cpp PRIVATE chowdsp_fft Catch2::Catch2WithMain)
-target_include_directories(test_chowsdp_fft_cpp PRIVATE ${pffft_SOURCE_DIR})
-target_compile_definitions(test_chowsdp_fft_cpp PRIVATE _USE_MATH_DEFINES=1)
+add_executable(test_chowdsp_fft_cpp test.cpp ${pffft_SOURCE_DIR}/pffft.c)
+target_link_libraries(test_chowdsp_fft_cpp PRIVATE chowdsp_fft Catch2::Catch2WithMain)
+target_include_directories(test_chowdsp_fft_cpp PRIVATE ${pffft_SOURCE_DIR})
+target_compile_definitions(test_chowdsp_fft_cpp PRIVATE _USE_MATH_DEFINES=1)
 
-add_executable(test_chowsdp_fft_c test.c ${pffft_SOURCE_DIR}/pffft.c)
-target_link_libraries(test_chowsdp_fft_c PRIVATE chowdsp_fft)
-target_include_directories(test_chowsdp_fft_c PRIVATE ${pffft_SOURCE_DIR})
-target_compile_definitions(test_chowsdp_fft_c PRIVATE _USE_MATH_DEFINES=1)
+add_executable(test_chowdsp_fft_c test.c ${pffft_SOURCE_DIR}/pffft.c)
+target_link_libraries(test_chowdsp_fft_c PRIVATE chowdsp_fft)
+target_include_directories(test_chowdsp_fft_c PRIVATE ${pffft_SOURCE_DIR})
+target_compile_definitions(test_chowdsp_fft_c PRIVATE _USE_MATH_DEFINES=1)