Fixed Gcc, Clang github actions.

WillisMedwell · Jan 22, 2024 · 05a756e · 05a756e
1 parent a032200
commit 05a756e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -6,12 +6,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: 
-      image: medwellwillis/clang-gcc-cmake-vcpkg-git:0.2
+      image: musicscience37/clang-ci:latest
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Build With Clang
       run: |
         cmake --preset clang-ninja
-        cmake --build ./build/clang-ninja --config Release
+        cmake --build ./build/clang-ninja --config Release
+
+    - name: Run Tests
+      run: |
+        ./build/clang-ninja/UtilyTest
+        ./build/clang-ninja/UtilyBenchmark
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: 
-      image: medwellwillis/clang-gcc-cmake-vcpkg-git:0.2
+      image: musicscience37/gcc-ci:latest
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,6 +83,7 @@ if(BUILD_UTILY_BENCHMARKS)
         FetchContent_MakeAvailable(benchmark)
     endif()
     add_executable(UtilyBenchmark ${UTILY_BENCHMARK_SOURCES})
+
 
     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
     if(DEFINED EMSCRIPTEN)

diff --git a/Dockerfile b/Dockerfile
diff --git a/build-all.bat b/build-all.bat
@@ -1,3 +1,5 @@
+@REM This is for local building on windows. You will need emscripten SDK, cmake, and ninja.
+
 @echo off
 set VCPKG_PATH=C:/apps/vcpkg/vcpkg/