Should not tag if -keepversion, unless also -forcetag

This commit is contained in:
Steve Streeting 2020-11-17 14:34:22 +00:00
parent ef3140dc50
commit a1482265e8

View File

@ -200,15 +200,17 @@ try {
# For tagging release # For tagging release
# We only need to grab the main version once # We only need to grab the main version once
$forcearg = "" if ((-not $keepversion) -or $forcetag) {
if ($forcetag) { $forcearg = ""
$forcearg = "-f" if ($forcetag) {
} $forcearg = "-f"
if (-not $test -and -not $dryrun) { }
if ($src -ne ".") { Push-Location $src } if (-not $test -and -not $dryrun) {
git tag $forcearg -a $versionNumber -m "Automated release tag" if ($src -ne ".") { Push-Location $src }
if ($LASTEXITCODE -ne 0) { Exit $LASTEXITCODE } git tag $forcearg -a $versionNumber -m "Automated release tag"
if ($src -ne ".") { Pop-Location } if ($LASTEXITCODE -ne 0) { Exit $LASTEXITCODE }
if ($src -ne ".") { Pop-Location }
}
} }
$ueEditorCmd = Join-Path $ueinstall "Engine/Binaries/Win64/UE4Editor-Cmd$exeSuffix" $ueEditorCmd = Join-Path $ueinstall "Engine/Binaries/Win64/UE4Editor-Cmd$exeSuffix"