diff options
Diffstat (limited to '.ci/scripts/windows')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 12 | ||||
| -rw-r--r-- | .ci/scripts/windows/exec.sh | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 5d5650d3b..d53281741 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -4,22 +4,10 @@ cd /yuzu ccache -s -# Dirty hack to trick unicorn makefile into believing we are in a MINGW system -mv /bin/uname /bin/uname1 && echo -e '#!/bin/sh\necho MINGW64' >> /bin/uname -chmod +x /bin/uname - -# Dirty hack to trick unicorn makefile into believing we have cmd -echo '' >> /bin/cmd -chmod +x /bin/cmd - mkdir build || true && cd build cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release ninja -# Clean up the dirty hacks -rm /bin/uname && mv /bin/uname1 /bin/uname -rm /bin/cmd - ccache -s echo "Tests skipped" diff --git a/.ci/scripts/windows/exec.sh b/.ci/scripts/windows/exec.sh index 4155ed5fc..f904544bd 100644 --- a/.ci/scripts/windows/exec.sh +++ b/.ci/scripts/windows/exec.sh @@ -2,4 +2,7 @@ mkdir -p "ccache" || true chmod a+x ./.ci/scripts/windows/docker.sh +# the UID for the container yuzu user is 1027 +sudo chown -R 1027 ./ docker run -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh $1 +sudo chown -R $UID ./ |