epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly return on failure in make.ps1

Browse Source
This commit is contained in:
abcdefg30
2020-12-25 19:30:49 +01:00
committed by abcdefg30
parent 0bf8d2241f
commit a68a91bb39
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
make.ps1
View File

@@ -99,13 +99,13 @@ function Test-Command
Write-Host "Testing mods..." -ForegroundColor Cyan Write-Host "Testing mods..." -ForegroundColor Cyan
Write-Host "Testing Tiberian Sun mod MiniYAML..." -ForegroundColor Cyan Write-Host "Testing Tiberian Sun mod MiniYAML..." -ForegroundColor Cyan
Invoke-Expression "$utilityPath ts --check-yaml" InvokeCommand "$utilityPath ts --check-yaml"
Write-Host "Testing Dune 2000 mod MiniYAML..." -ForegroundColor Cyan Write-Host "Testing Dune 2000 mod MiniYAML..." -ForegroundColor Cyan
Invoke-Expression "$utilityPath d2k --check-yaml" InvokeCommand "$utilityPath d2k --check-yaml"
Write-Host "Testing Tiberian Dawn mod MiniYAML..." -ForegroundColor Cyan Write-Host "Testing Tiberian Dawn mod MiniYAML..." -ForegroundColor Cyan
Invoke-Expression "$utilityPath cnc --check-yaml" InvokeCommand "$utilityPath cnc --check-yaml"
Write-Host "Testing Red Alert mod MiniYAML..." -ForegroundColor Cyan Write-Host "Testing Red Alert mod MiniYAML..." -ForegroundColor Cyan
Invoke-Expression "$utilityPath ra --check-yaml" InvokeCommand "$utilityPath ra --check-yaml"
} }
function Check-Command function Check-Command
@@ -120,10 +120,10 @@ function Check-Command
if ((CheckForUtility) -eq 0) if ((CheckForUtility) -eq 0)
{ {
Write-Host "Checking for explicit interface violations..." -ForegroundColor Cyan Write-Host "Checking for explicit interface violations..." -ForegroundColor Cyan
Invoke-Expression "$utilityPath all --check-explicit-interfaces" InvokeCommand "$utilityPath all --check-explicit-interfaces"
Write-Host "Checking for incorrect conditional trait interface overrides..." -ForegroundColor Cyan Write-Host "Checking for incorrect conditional trait interface overrides..." -ForegroundColor Cyan
Invoke-Expression "$utilityPath all --check-conditional-trait-interface-overrides" InvokeCommand "$utilityPath all --check-conditional-trait-interface-overrides"
} }
} }
@@ -201,6 +201,20 @@ function WaitForInput
} }
} }
function InvokeCommand
{
param($expression)
# $? is the return value of the called expression
# Invoke-Expression itself will always succeed, even if the invoked expression fails
# So temporarily store the return value in $success
$expression += '; $success = $?'
Invoke-Expression $expression
if ($success -eq $False)
{
exit 1
}
}
############################################################### ###############################################################
############################ Main ############################# ############################ Main #############################
############################################################### ###############################################################