From df9cc1b84cff00e3e44de4efa63e08644c8fa6a1 Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Tue, 4 Jul 2023 21:02:33 -0700 Subject: [PATCH] ci: Fix CI builds being marked as dirty. (#6656) --- .ci/macos.sh | 4 +--- .github/workflows/ci.yml | 2 ++ .gitignore | 4 ++++ .gitmodules | 2 +- externals/discord-rpc | 2 +- externals/libressl | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.ci/macos.sh b/.ci/macos.sh index 0ae06761b..5933b6f89 100755 --- a/.ci/macos.sh +++ b/.ci/macos.sh @@ -1,7 +1,6 @@ #!/bin/bash -ex mkdir build && cd build -# TODO: LibreSSL ASM disabled due to platform detection issues in cross-compile build. cmake .. -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_OSX_ARCHITECTURES="$TARGET" \ @@ -10,8 +9,7 @@ cmake .. -GNinja \ -DENABLE_QT_TRANSLATION=ON \ -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ - -DUSE_DISCORD_PRESENCE=ON \ - -DENABLE_ASM=OFF + -DUSE_DISCORD_PRESENCE=ON ninja ninja bundle diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43e66b82f..bdd05d4b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,6 +182,8 @@ jobs: vulkan-use-cache: true - name: Test glslangValidator run: glslangValidator --version + - name: Disable line ending translation + run: git config --global core.autocrlf input - name: Build run: ./.ci/windows.sh - name: Pack diff --git a/.gitignore b/.gitignore index 0da65b8d6..485512a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ src/common/scm_rev.cpp .vs/ .vscode/ .cache/ +cmake-build-debug/ +cmake-build-release/ CMakeLists.txt.user* # *nix related @@ -41,4 +43,6 @@ Thumbs.db repo/ # GitHub Actions generated files +.ccache/ node_modules/ +VULKAN_SDK/ diff --git a/.gitmodules b/.gitmodules index 70f5ee225..cd4790369 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ url = https://github.com/mozilla/cubeb [submodule "discord-rpc"] path = externals/discord-rpc - url = https://github.com/discord/discord-rpc.git + url = https://github.com/yuzu-emu/discord-rpc.git [submodule "cpp-jwt"] path = externals/cpp-jwt url = https://github.com/arun11299/cpp-jwt.git diff --git a/externals/discord-rpc b/externals/discord-rpc index 963aa9f3e..20cc99aef 160000 --- a/externals/discord-rpc +++ b/externals/discord-rpc @@ -1 +1 @@ -Subproject commit 963aa9f3e5ce81a4682c6ca3d136cddda614db33 +Subproject commit 20cc99aeffa08a4834f156b6ab49ed68618cf94a diff --git a/externals/libressl b/externals/libressl index dcf9a84ab..d4fc7348a 160000 --- a/externals/libressl +++ b/externals/libressl @@ -1 +1 @@ -Subproject commit dcf9a84aba598f827f65d946d31c3c93af62790a +Subproject commit d4fc7348a3fbe9c659a373e28a3b50f052f7c50a