Skip to content

Commit

Permalink
Merge branch 'hotfix-build' into 'release/v0.5.1-hotfix'
Browse files Browse the repository at this point in the history
Porting in latest build files as of a2b26a7e

See merge request lightspeedrtx/dxvk-remix-nv!1266
  • Loading branch information
MarkEHenderson committed Jan 28, 2025
2 parents 2583184 + cb7f33e commit 3cf6d55
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion build_common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,13 @@ If (Test-Path env:LIBPATH) {
Push-Location "${vsPath}\VC\Auxiliary\Build"
cmd /c "vcvarsall.bat x64&set" |
ForEach-Object {
# Due to some odd behavior with how powershell core (pwsh) (powershell 5.X not tested) interprets a specific
# predefined gitlab CI variable (in this case CI_MERGE_REQUEST_DESCRIPTION) with a value that includes ===
# The `Contains` method is used to ignore the string === to prevent pwsh from erroneously encountering an error.
If ($_ -match "=") {
$v = $_.split("="); Set-Item -Force -Path "ENV:\$($v[0])" -Value "$($v[1])"
If (-not ($_.Contains('==='))) {
$v = $_.split("="); Set-Item -Force -Path "ENV:\$($v[0])" -Value "$($v[1])"
}
}
}
Pop-Location
Expand Down

0 comments on commit 3cf6d55

Please sign in to comment.