Don't cleanup in build tool, do it in get latest before pull (and close editor earlier)

This commit is contained in:
Steve Streeting 2020-08-04 16:02:25 +01:00
parent e670d33c44
commit 284d3e82ec
2 changed files with 11 additions and 11 deletions

View File

@ -104,17 +104,6 @@ try {
throw "Build.bat missing at $buildbat : Aborting"
}
# Run cleanup tool
$cleanupargs = @()
if ($nocloseeditor) {
$cleanupargs += "-nocloseeditor"
}
if ($dryrun) {
$cleanupargs += "-dryrun"
}
# Use Invoke-Expression so we can use a string as options
Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs"
$buildargs = ""
switch ($mode) {

View File

@ -69,6 +69,17 @@ try {
}
}
# Run cleanup tool
$cleanupargs = @()
if ($nocloseeditor) {
$cleanupargs += "-nocloseeditor"
}
if ($dryrun) {
$cleanupargs += "-dryrun"
}
# Use Invoke-Expression so we can use a string as options
Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs"
# Use rebase pull to keep simpler
Write-Output "Pulling latest from Git..."
git pull --rebase --recurse-submodules