diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 0fe5721..9e2e805 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: build-unix: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: type: [ Debug, Release ] @@ -27,7 +27,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt-get update - sudo apt-get install -y ninja-build libsdl2-dev libgtk-3-dev lld + sudo apt-get install -y ninja-build libsdl2-dev libgtk-3-dev lld llvm clang # Install SDL2 echo ::group::install SDL2 @@ -77,7 +77,10 @@ jobs: export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build - cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j 8 -- -v + cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j 8 + env: + CC: clang + CXX: clang++ - name: Archive Zelda64Recomp uses: actions/upload-artifact@v2 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index b8ece13..a13b93d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ set_source_files_properties(${CMAKE_SOURCE_DIR}/RecompiledPatches/patches.c PROP # Build patches elf add_custom_target(PatchesBin - COMMAND make -d + COMMAND make WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/patches BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.bin )