From 8aa09a673cdfacc794b5740468fa4f6919a543cc Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Mon, 15 Feb 2021 11:10:14 -0800 Subject: [PATCH 1/2] Fix cmake command Remove trailing space in line 22. --- .github/workflows/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.sh b/.github/workflows/docker.sh index d262669d9..2e1062679 100644 --- a/.github/workflows/docker.sh +++ b/.github/workflows/docker.sh @@ -18,7 +18,7 @@ mkdir build && cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ + -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ -DTITLE_BAR_FORMAT_IDLE="$title" \ -DTITLE_BAR_FORMAT_RUNNING="$title | {3}" \ From 4e14103b4c1a49172eac94554fb997273ba10165 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Mon, 15 Feb 2021 17:55:43 -0800 Subject: [PATCH 2/2] use .conan cache link to conan cached files to speedup build --- .github/workflows/docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.sh b/.github/workflows/docker.sh index 2e1062679..9ccd02da2 100644 --- a/.github/workflows/docker.sh +++ b/.github/workflows/docker.sh @@ -5,6 +5,7 @@ BRANCH=`echo ${GITHUB_REF##*/}` ver=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) title="yuzu Early Access $ver" +ln -s /home/yuzu/.conan /root yuzupatch=( $(ls -d patches/* ) ) for i in "${yuzupatch[@]}"; do patch -p1 < "$i"; done