From 82a105e2f859ab1cb2567bc50cee5a32c3616981 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:57:09 -0400
Subject: [PATCH 1/2] android-build: Run only on yuzu-android repository
---
.github/workflows/android-build.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index e639e965ab..5893f860e7 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:
From 738b37e5089356911e19d51136e196de3495fea1 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:08:18 -0400
Subject: [PATCH 2/2] verify: Remove dependence on chocolatey
---
.github/workflows/verify.yml | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 6420fd82b4..cbe6b0fbd3 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