Merge pull request #11049 from Morph1984/gha

github: Remove dependence on chocolatey for buildcache
This commit is contained in:
bunnei 2023-07-07 13:47:59 -07:00 committed by GitHub
commit f80edad109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions

View File

@ -10,6 +10,7 @@ on:
jobs: jobs:
android: android:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.repository == 'yuzu-emu/yuzu-android' }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View File

@ -85,16 +85,17 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-msvc- ${{ runner.os }}-msvc-
- name: Install dependencies - name: Install dependencies
# due to how chocolatey works, only cmd.exe is supported here shell: pwsh
shell: cmd
run: | run: |
choco install wget $ErrorActionPreference = "Stop"
call refreshenv $BuildCacheVer = "v0.28.4"
wget https://github.com/mbitsnbites/buildcache/releases/download/v0.27.6/buildcache-windows.zip $File = "buildcache-windows.zip"
7z x buildcache-windows.zip $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File"
copy buildcache\bin\buildcache.exe C:\ProgramData\chocolatey\bin $WebClient = New-Object System.Net.WebClient
rmdir buildcache $WebClient.DownloadFile($Uri, $File)
echo %PATH% >> %GITHUB_PATH% 7z x $File
$CurrentDir = Convert-Path .
echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Install Vulkan SDK - name: Install Vulkan SDK
shell: pwsh shell: pwsh
run: .\.ci\scripts\windows\install-vulkan-sdk.ps1 run: .\.ci\scripts\windows\install-vulkan-sdk.ps1