From 5691d2f1afb103eea4e41db5ed29eeca7862ac67 Mon Sep 17 00:00:00 2001 From: dcvz Date: Fri, 17 May 2024 18:47:37 +0200 Subject: [PATCH] Include assets folder in artifact --- .github/workflows/validate.yml | 11 ++++++++--- CMakeLists.txt | 2 -- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index c62c49a..304947c 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -78,11 +78,16 @@ jobs: cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j 8 + - name: Prepare Assets Folder + run: | + rm -rf assets/scss - name: Archive Zelda64Recomp - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: Zelda64Recompiled - path: cmake-build/Zelda64Recompiled + name: Zelda64Recompiled-${{ matrix.type }} + path: | + cmake-build/Zelda64Recompiled + assets/ # build-windows: # runs-on: windows-latest # strategy: diff --git a/CMakeLists.txt b/CMakeLists.txt index 049181a..243ba12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,9 +43,7 @@ add_library(RecompiledFuncs STATIC) target_compile_options(RecompiledFuncs PRIVATE # -Wno-unused-but-set-variable -fno-strict-aliasing - -Wno-implicit-declarations -Wno-implicit-function-declaration - -Wunknown-warning-option ) target_include_directories(RecompiledFuncs PRIVATE