From a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Wed, 22 Dec 2021 23:31:57 -0700 Subject: CI: Use GitHub Actions to check pull requests --- .ci/scripts/windows/docker.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to '.ci/scripts/windows') diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index f53d837d1..6420c8f7d 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -2,19 +2,24 @@ set -e -cd /yuzu +#cd /yuzu ccache -s -mkdir build || true && cd build -LDFLAGS="-fuse-ld=lld" +mkdir -p "$HOME/.conan/" +cp -rv /home/yuzu/.conan/profiles/ "$HOME/.conan/" +cp -rv /home/yuzu/.conan/settings.yml "$HOME/.conan/" + +mkdir -p build && cd build +export LDFLAGS="-fuse-ld=lld" # -femulated-tls required due to an incompatibility between GCC and Clang # TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate +export CFLAGS="-femulated-tls" +export CXXFLAGS="${CFLAGS}" cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="-femulated-tls" \ - -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWClangCross.cmake" \ - -DDISPLAY_VERSION=$1 \ + -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ + -DDISPLAY_VERSION="$1" \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_CCACHE=ON \ -- cgit v1.2.3 From 43a1948d5807469b5ddcea0e3f69b5659171d742 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 23 Dec 2021 04:43:24 -0700 Subject: CI: use Ninja to build stuff faster --- .ci/scripts/windows/docker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.ci/scripts/windows') diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 6420c8f7d..46cdb68f5 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -6,9 +6,9 @@ set -e ccache -s -mkdir -p "$HOME/.conan/" -cp -rv /home/yuzu/.conan/profiles/ "$HOME/.conan/" -cp -rv /home/yuzu/.conan/settings.yml "$HOME/.conan/" +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" mkdir -p build && cd build export LDFLAGS="-fuse-ld=lld" -- cgit v1.2.3 From 40493231edad7085544b79b6c3ac7360d112170c Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 23 Dec 2021 18:23:02 -0700 Subject: CI: fix caching --- .ci/scripts/windows/docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.ci/scripts/windows') diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 46cdb68f5..d0c70bf09 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -4,7 +4,7 @@ set -e #cd /yuzu -ccache -s +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" @@ -28,7 +28,7 @@ cmake .. \ -GNinja ninja yuzu yuzu-cmd -ccache -s +ccache -sv echo "Tests skipped" #ctest -VV -C Release -- cgit v1.2.3 From 9981ce8d98953c6353cbc883db225412952459cc Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 18 Jun 2022 23:15:30 -0600 Subject: CI: upload artifacts for pull request verification --- .ci/scripts/windows/upload.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .ci/scripts/windows/upload.sh (limited to '.ci/scripts/windows') diff --git a/.ci/scripts/windows/upload.sh b/.ci/scripts/windows/upload.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 312e5eda66e4e610300bfa178f1c1ce70293bc12 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 4 Jul 2022 21:18:17 -0600 Subject: CI: lint scripts --- .ci/scripts/windows/docker.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.ci/scripts/windows') diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index d0c70bf09..dcdf39e3e 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -14,8 +14,7 @@ mkdir -p build && cd build export LDFLAGS="-fuse-ld=lld" # -femulated-tls required due to an incompatibility between GCC and Clang # TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate -export CFLAGS="-femulated-tls" -export CXXFLAGS="${CFLAGS}" +export CXXFLAGS="-femulated-tls" cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ -- cgit v1.2.3 From 1524ff87d26e95f3fa722ca23eb30895e9b6f793 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 4 Jul 2022 21:21:36 -0600 Subject: CI: unbreak ADO after GHA changes --- .ci/scripts/windows/docker.sh | 4 ++-- .ci/scripts/windows/exec.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.ci/scripts/windows') 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 ./ -- cgit v1.2.3