diff options
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 1 | ||||
| -rw-r--r-- | .github/workflows/android-build.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/verify.yml | 19 | ||||
| -rw-r--r-- | src/android/app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/common/settings.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/arm_interface.cpp | 2 |
6 files changed, 14 insertions, 13 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 0be3613aa..45f75c874 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -56,7 +56,6 @@ for i in package/*.exe; do x86_64-w64-mingw32-strip "${i}" done -pip3 install pefile python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" # copy FFmpeg libraries diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index e639e965a..5893f860e 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -10,6 +10,7 @@ on: jobs: android: runs-on: ubuntu-latest + if: ${{ github.repository == 'yuzu-emu/yuzu-android' }} steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 6420fd82b..cbe6b0fbd 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -85,16 +85,17 @@ jobs: restore-keys: | ${{ runner.os }}-msvc- - name: Install dependencies - # due to how chocolatey works, only cmd.exe is supported here - shell: cmd + shell: pwsh run: | - choco install wget - call refreshenv - wget https://github.com/mbitsnbites/buildcache/releases/download/v0.27.6/buildcache-windows.zip - 7z x buildcache-windows.zip - copy buildcache\bin\buildcache.exe C:\ProgramData\chocolatey\bin - rmdir buildcache - echo %PATH% >> %GITHUB_PATH% + $ErrorActionPreference = "Stop" + $BuildCacheVer = "v0.28.4" + $File = "buildcache-windows.zip" + $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File" + $WebClient = New-Object System.Net.WebClient + $WebClient.DownloadFile($Uri, $File) + 7z x $File + $CurrentDir = Convert-Path . + echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Install Vulkan SDK shell: pwsh run: .\.ci\scripts\windows\install-vulkan-sdk.ps1 diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 742685fb0..6184f3eb6 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-3.0-or-later android:label="@string/app_name_suffixed" android:icon="@drawable/ic_launcher" android:allowBackup="true" - android:hasFragileUserData="true" + android:hasFragileUserData="false" android:supportsRtl="true" android:isGame="true" android:localeConfig="@xml/locales_config" diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6cbbea1b2..5972480e5 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -27,8 +27,8 @@ std::string GetTimeZoneString() { std::string location_name; if (time_zone_index == 0) { // Auto #if __cpp_lib_chrono >= 201907L - const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); try { + const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); std::string_view current_zone_name = current_zone->name(); location_name = current_zone_name; diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index beaea64b3..aa0eb9791 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -185,7 +185,7 @@ void ARM_Interface::Run() { // Notify the debugger and go to sleep if a breakpoint was hit, // or if the thread is unable to continue for any reason. if (True(hr & HaltReason::InstructionBreakpoint) || True(hr & HaltReason::PrefetchAbort)) { - if (!True(hr & HaltReason::InstructionBreakpoint)) { + if (!True(hr & HaltReason::PrefetchAbort)) { RewindBreakpointInstruction(); } if (system.DebuggerEnabled()) { |