From 439bc787905cae2bea51989aea868263941995ff Mon Sep 17 00:00:00 2001 From: Kirill Artemov Date: Sat, 17 May 2025 16:05:43 +0200 Subject: [PATCH] Pin llvmpipe version, expand test matrix with a single enableGPU target --- .github/workflows/build-tests-windows.yml | 6 ++++++ dist/platforms/windows/entrypoint.ps1 | 6 ++++-- dist/platforms/windows/install_llvmpipe.ps1 | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-tests-windows.yml b/.github/workflows/build-tests-windows.yml index db2fab20..38e98078 100644 --- a/.github/workflows/build-tests-windows.yml +++ b/.github/workflows/build-tests-windows.yml @@ -26,6 +26,12 @@ jobs: - StandaloneWindows64 # Build a Windows 64-bit standalone. - WSAPlayer # Build a UWP App - tvOS # Build an Apple TV XCode project + include: + # Additionally test enableGPU build for a standalone windows target + - projectPath: test-project + unityVersion: 2023.2.2f1 + targetPlatform: StandaloneWindows64 + enableGPU: true steps: ########################### diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1 index 17606efa..1163f9e5 100644 --- a/dist/platforms/windows/entrypoint.ps1 +++ b/dist/platforms/windows/entrypoint.ps1 @@ -13,8 +13,10 @@ Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force } # Setup Git Credentials . "c:\steps\set_gitcredential.ps1" -# Install LLVMpipe software graphics driver -. "c:\steps\install_llvmpipe.ps1" +if ($env:ENABLE_GPU -ne "true") { + # Install LLVMpipe software graphics driver + . "c:\steps\install_llvmpipe.ps1" +} # Activate Unity if ($env:SKIP_ACTIVATION -ne "true") { diff --git a/dist/platforms/windows/install_llvmpipe.ps1 b/dist/platforms/windows/install_llvmpipe.ps1 index 253d9b0c..0e942b12 100644 --- a/dist/platforms/windows/install_llvmpipe.ps1 +++ b/dist/platforms/windows/install_llvmpipe.ps1 @@ -6,8 +6,8 @@ $Private:destinationPath = "$Env:UNITY_PATH\Editor\" $LLVMPIPE_INSTALLED = "false" try { - # Get the latest release info from GitHub API - $releaseUrl = "https://api.github.com/repos/$repo/releases/latest" + # Get the 25.1.0 release info from GitHub API (version fixed to decrease probability of breakage) + $releaseUrl = "https://api.github.com/repos/$repo/releases/25.1.0" $release = Invoke-RestMethod -Uri $releaseUrl -Headers @{ "User-Agent" = "PowerShell" } # Get the download URL for the zip asset