diff options
author | liushuyu <liushuyu011@gmail.com> | 2022-07-05 05:21:36 +0200 |
---|---|---|
committer | liushuyu <liushuyu011@gmail.com> | 2022-07-05 08:50:46 +0200 |
commit | 1524ff87d26e95f3fa722ca23eb30895e9b6f793 (patch) | |
tree | 3befd2b607728e067c6b1ae315d9ca97ca394cf8 /.ci/scripts/windows | |
parent | CI: lint scripts (diff) | |
download | yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.gz yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.bz2 yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.lz yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.xz yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.zst yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.zip |
Diffstat (limited to '')
-rwxr-xr-x | .ci/scripts/windows/docker.sh | 4 | ||||
-rw-r--r-- | .ci/scripts/windows/exec.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index dcdf39e3e..d670fe47d 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -7,8 +7,8 @@ set -e ccache -sv mkdir -p "$HOME/.conan/profiles" -wget -nc "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/default" -O "$HOME/.conan/profiles/default" -wget -nc "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/settings.yml" -O "$HOME/.conan/settings.yml" +wget -c "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/default" -O "$HOME/.conan/profiles/default" +wget -c "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/settings.yml" -O "$HOME/.conan/settings.yml" mkdir -p build && cd build export LDFLAGS="-fuse-ld=lld" diff --git a/.ci/scripts/windows/exec.sh b/.ci/scripts/windows/exec.sh index f904544bd..bf5c5fb63 100644 --- a/.ci/scripts/windows/exec.sh +++ b/.ci/scripts/windows/exec.sh @@ -4,5 +4,5 @@ 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 +docker run -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh "$1" sudo chown -R $UID ./ |