citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

ci: Fix CI builds being marked as dirty. (#6656)

This commit is contained in:
Steveice10 2023-07-04 21:02:33 -07:00 committed by GitHub
parent 13a8969824
commit df9cc1b84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/macos.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash -ex #!/bin/bash -ex
mkdir build && cd build mkdir build && cd build
# TODO: LibreSSL ASM disabled due to platform detection issues in cross-compile build.
cmake .. -GNinja \ cmake .. -GNinja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES="$TARGET" \ -DCMAKE_OSX_ARCHITECTURES="$TARGET" \
@ -10,8 +9,7 @@ cmake .. -GNinja \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON \ -DUSE_DISCORD_PRESENCE=ON
-DENABLE_ASM=OFF
ninja ninja
ninja bundle ninja bundle

2
.github/workflows/ci.yml vendored
View File

@ -182,6 +182,8 @@ jobs:
vulkan-use-cache: true vulkan-use-cache: true
- name: Test glslangValidator - name: Test glslangValidator
run: glslangValidator --version run: glslangValidator --version
- name: Disable line ending translation
run: git config --global core.autocrlf input
- name: Build - name: Build
run: ./.ci/windows.sh run: ./.ci/windows.sh
- name: Pack - name: Pack

4
.gitignore vendored
View File

@ -13,6 +13,8 @@ src/common/scm_rev.cpp
.vs/ .vs/
.vscode/ .vscode/
.cache/ .cache/
cmake-build-debug/
cmake-build-release/
CMakeLists.txt.user* CMakeLists.txt.user*
# *nix related # *nix related
@ -41,4 +43,6 @@ Thumbs.db
repo/ repo/
# GitHub Actions generated files # GitHub Actions generated files
.ccache/
node_modules/ node_modules/
VULKAN_SDK/

2
.gitmodules vendored
View File

@ -36,7 +36,7 @@
url = https://github.com/mozilla/cubeb url = https://github.com/mozilla/cubeb
[submodule "discord-rpc"] [submodule "discord-rpc"]
path = externals/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"] [submodule "cpp-jwt"]
path = externals/cpp-jwt path = externals/cpp-jwt
url = https://github.com/arun11299/cpp-jwt.git url = https://github.com/arun11299/cpp-jwt.git

2
externals/discord-rpc vendored

@ -1 +1 @@
Subproject commit 963aa9f3e5ce81a4682c6ca3d136cddda614db33 Subproject commit 20cc99aeffa08a4834f156b6ab49ed68618cf94a

2
externals/libressl vendored

@ -1 +1 @@
Subproject commit dcf9a84aba598f827f65d946d31c3c93af62790a Subproject commit d4fc7348a3fbe9c659a373e28a3b50f052f7c50a