CI: unbreak ADO after GHA changes

author: liushuyu 2022-07-04 21:21:36 -0600
committer: liushuyu 2022-07-05 00:50:46 -0600
commit: 1524ff87d26e95f3fa722ca23eb30895e9b6f793 (patch)
tree: 3befd2b607728e067c6b1ae315d9ca97ca394cf8
parent: CI: lint scripts (diff)
download: yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.gz
yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.xz
yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.zip
5 files changed, 6 insertions, 6 deletions
diff --git a/.ci/scripts/clang/exec.sh b/.ci/scripts/clang/exec.sh
index e56cd4325..a213aac27 100644
--- a/.ci/scripts/clang/exec.sh
+++ b/.ci/scripts/clang/exec.sh
@@ -4,5 +4,5 @@ mkdir -p "ccache"  || true
 chmod a+x ./.ci/scripts/clang/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh $1
+docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh "$1"
 sudo chown -R $UID ./
diff --git a/.ci/scripts/format/exec.sh b/.ci/scripts/format/exec.sh
index e9e9d2e17..c50e90d66 100644
--- a/.ci/scripts/format/exec.sh
+++ b/.ci/scripts/format/exec.sh
@@ -3,5 +3,5 @@
 chmod a+x ./.ci/scripts/format/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -v $(pwd):/yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh
+docker run -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh
 sudo chown -R $UID ./
diff --git a/.ci/scripts/linux/exec.sh b/.ci/scripts/linux/exec.sh
index a7deddeb3..fc4594d65 100644
--- a/.ci/scripts/linux/exec.sh
+++ b/.ci/scripts/linux/exec.sh
@@ -4,5 +4,5 @@ mkdir -p "ccache"  || true
 chmod a+x ./.ci/scripts/linux/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1
+docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh "$1"
 sudo chown -R $UID ./
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 -c "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/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 ./
author	liushuyu	2022-07-04 21:21:36 -0600
committer	liushuyu	2022-07-05 00:50:46 -0600
commit	1524ff87d26e95f3fa722ca23eb30895e9b6f793 (patch)
tree	3befd2b607728e067c6b1ae315d9ca97ca394cf8
parent	CI: lint scripts (diff)
download	yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.gz yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.tar.xz yuzu-1524ff87d26e95f3fa722ca23eb30895e9b6f793.zip

diff --git a/.ci/scripts/clang/exec.sh b/.ci/scripts/clang/exec.sh index e56cd4325..a213aac27 100644 --- a/.ci/scripts/clang/exec.sh +++ b/.ci/scripts/clang/exec.sh
@@ -4,5 +4,5 @@ mkdir -p "ccache" \|\| true
4	chmod a+x ./.ci/scripts/clang/docker.sh	4	chmod a+x ./.ci/scripts/clang/docker.sh
5	# the UID for the container yuzu user is 1027	5	# the UID for the container yuzu user is 1027
6	sudo chown -R 1027 ./	6	sudo chown -R 1027 ./
7	docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh $1	7	docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh "$1"
8	sudo chown -R $UID ./	8	sudo chown -R $UID ./


diff --git a/.ci/scripts/format/exec.sh b/.ci/scripts/format/exec.sh index e9e9d2e17..c50e90d66 100644 --- a/.ci/scripts/format/exec.sh +++ b/.ci/scripts/format/exec.sh
@@ -3,5 +3,5 @@
3	chmod a+x ./.ci/scripts/format/docker.sh	3	chmod a+x ./.ci/scripts/format/docker.sh
4	# the UID for the container yuzu user is 1027	4	# the UID for the container yuzu user is 1027
5	sudo chown -R 1027 ./	5	sudo chown -R 1027 ./
6	docker run -v $(pwd):/yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh	6	docker run -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh
7	sudo chown -R $UID ./	7	sudo chown -R $UID ./


diff --git a/.ci/scripts/linux/exec.sh b/.ci/scripts/linux/exec.sh index a7deddeb3..fc4594d65 100644 --- a/.ci/scripts/linux/exec.sh +++ b/.ci/scripts/linux/exec.sh
@@ -4,5 +4,5 @@ mkdir -p "ccache" \|\| true
4	chmod a+x ./.ci/scripts/linux/docker.sh	4	chmod a+x ./.ci/scripts/linux/docker.sh
5	# the UID for the container yuzu user is 1027	5	# the UID for the container yuzu user is 1027
6	sudo chown -R 1027 ./	6	sudo chown -R 1027 ./
7	docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1	7	docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh "$1"
8	sudo chown -R $UID ./	8	sudo chown -R $UID ./


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
7	ccache -sv	7	ccache -sv
8		8
9	mkdir -p "$HOME/.conan/profiles"	9	mkdir -p "$HOME/.conan/profiles"
10	wget -nc "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/default" -O "$HOME/.conan/profiles/default"	10	wget -c "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/default" -O "$HOME/.conan/profiles/default"
11	wget -nc "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/settings.yml" -O "$HOME/.conan/settings.yml"	11	wget -c "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/settings.yml" -O "$HOME/.conan/settings.yml"
12		12
13	mkdir -p build && cd build	13	mkdir -p build && cd build
14	export LDFLAGS="-fuse-ld=lld"	14	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
4	chmod a+x ./.ci/scripts/windows/docker.sh	4	chmod a+x ./.ci/scripts/windows/docker.sh
5	# the UID for the container yuzu user is 1027	5	# the UID for the container yuzu user is 1027
6	sudo chown -R 1027 ./	6	sudo chown -R 1027 ./
7	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	7	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"
8	sudo chown -R $UID ./	8	sudo chown -R $UID ./