From 3530fd224f39758da3db77b1c9f9ff15aa6f05ab Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Mon, 10 May 2021 17:43:31 -0700 Subject: [PATCH 1/2] Update docker.sh build with externals exclude externals from error suppression --- .github/workflows/docker.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker.sh b/.github/workflows/docker.sh index 6b7ed6f59..f468fd540 100644 --- a/.github/workflows/docker.sh +++ b/.github/workflows/docker.sh @@ -7,22 +7,13 @@ title="yuzu Early Access $ver" ln -s /home/yuzu/.conan /root -#SDL-2.0.15-14858.tar.gz -mkdir SDL2 && cd SDL2 -curl -sLO http://libsdl.org/tmp/SDL-2.0.15-14858.tar.gz -tar -xzf SDL-2.0.15-14858.tar.gz -cd SDL-2.0.15-14858 -./configure --prefix=/usr -make && make install -cd ../../ - yuzupatch=( $(ls -d patches/* ) ) for i in "${yuzupatch[@]}"; do patch -p1 < "$i"; done -find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror$/-W/g' {} + -find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} + -find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*$/ /g' {} + -find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} + +find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/^.*-Werror$/-W/g' {} + +find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} + +find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/^.*-Werror=.*$/ /g' {} + +find . -name "CMakeLists.txt" ! -path "*/externals/*" -exec sed -i 's/-Werror/-W/g' {} + mkdir build && cd build From ae555dfe591769a1e347f8da24925ee7f94eee9b Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Mon, 10 May 2021 17:44:52 -0700 Subject: [PATCH 2/2] Update build.yml include externals in build --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e071e50b..5fcfb6d4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 + with: + submodules: recursive - name: Prepare ccache timestamp id: ccache_cache_timestamp shell: cmake -P {0}