Merge pull request #11049 from Morph1984/gha

github: Remove dependence on chocolatey for buildcache

2 files changed, 11 insertions, 9 deletions

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