Mirrors/UEScripts
1
0
Fork 0
mirror of https://github.com/sinbad/UEScripts.git synced 2025-02-23 13:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove forcetag argument, was causing issues

Browse Source
This commit is contained in:
Steve Streeting 2023-07-20 14:46:23 +01:00
parent 779ab86637
commit b55c4b0dac
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/Package.md
View File

@ -9,15 +9,14 @@ in the root of your Unreal project. Please see the [Package Config File docs](Pa
for a full description of this file. for a full description of this file.
``` ```
ue-package.ps1 [-src:sourcefolder] [-major|-minor|-patch|-hotfix] [-keepversion] [-force] [-variant=VariantName] [-test] [-dryrun] ue-package.ps1 [-src:sourcefolder] [-major|-minor|-patch|-hotfix] [-keepversion] [-variant=VariantName] [-test] [-dryrun]
-src : Source folder (current folder if omitted), must contain packageconfig.json -src : Source folder (current folder if omitted), must contain packageconfig.json
-major : Increment major version i.e. [x++].0.0.0 -major : Increment major version i.e. [x++].0.0.0
-minor : Increment minor version i.e. x.[x++].0.0 -minor : Increment minor version i.e. x.[x++].0.0
-patch : Increment patch version i.e. x.x.[x++].0 (default) -patch : Increment patch version i.e. x.x.[x++].0 (default)
-hotfix : Increment hotfix version i.e. x.x.x.[x++] -hotfix : Increment hotfix version i.e. x.x.x.[x++]
-keepversion : Keep current version number, doesn't tag unless -forcetag -keepversion : Keep current version number, doesn't tag
-forcetag : Move any existing version tag
-variants Name1,Name2,Name3 -variants Name1,Name2,Name3
: Build only named variants instead of DefaultVariants from packageconfig.json : Build only named variants instead of DefaultVariants from packageconfig.json
-test : Testing mode, separate builds, allow dirty working copy -test : Testing mode, separate builds, allow dirty working copy

3
doc/PluginPackage.md
View File

@ -20,8 +20,7 @@ Usage:
-minor : Increment minor version i.e. x.[x++].0.0 -minor : Increment minor version i.e. x.[x++].0.0
-patch : Increment patch version i.e. x.x.[x++].0 (default) -patch : Increment patch version i.e. x.x.[x++].0 (default)
-hotfix : Increment hotfix version i.e. x.x.x.[x++] -hotfix : Increment hotfix version i.e. x.x.x.[x++]
-keepversion : Keep current version number, doesn't tag unless -forcetag -keepversion : Keep current version number, doesn't tag
-forcetag : Move any existing version tag
-notag : Don't tag even if updating version -notag : Don't tag even if updating version
-test : Testing mode, separate builds, allow dirty working copy -test : Testing mode, separate builds, allow dirty working copy
-browse : After packaging, browse the output folder -browse : After packaging, browse the output folder

12
ue-package.ps1
View File

@ -11,8 +11,6 @@ param (
[switch]$hotfix = $false, [switch]$hotfix = $false,
# Don't incrememnt version # Don't incrememnt version
[switch]$keepversion = $false, [switch]$keepversion = $false,
# Force move tag
[switch]$forcetag = $false,
# Name of variant to build (optional, uses DefaultVariants from packageconfig.json if unspecified) # Name of variant to build (optional, uses DefaultVariants from packageconfig.json if unspecified)
[array]$variants, [array]$variants,
# Testing mode; skips clean checks, tags # Testing mode; skips clean checks, tags
@ -43,7 +41,6 @@ function Write-Usage {
Write-Output " -patch : Increment patch version i.e. x.x.[x++].0 (default)" Write-Output " -patch : Increment patch version i.e. x.x.[x++].0 (default)"
Write-Output " -hotfix : Increment hotfix version i.e. x.x.x.[x++]" Write-Output " -hotfix : Increment hotfix version i.e. x.x.x.[x++]"
Write-Output " -keepversion : Keep current version number, doesn't tag unless -forcetag" Write-Output " -keepversion : Keep current version number, doesn't tag unless -forcetag"
Write-Output " -forcetag : Move any existing version tag"
Write-Output " -variants Name1,Name2,Name3" Write-Output " -variants Name1,Name2,Name3"
Write-Output " : Build only named variants instead of DefaultVariants from packageconfig.json" Write-Output " : Build only named variants instead of DefaultVariants from packageconfig.json"
Write-Output " -test : Testing mode, separate builds, allow dirty working copy" Write-Output " -test : Testing mode, separate builds, allow dirty working copy"
@ -199,14 +196,11 @@ 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
if ((-not $keepversion) -or $forcetag) { if (-not $keepversion) {
$forcearg = ""
if ($forcetag) {
$forcearg = "-f"
}
if (-not $test -and -not $dryrun -and $isGit) { if (-not $test -and -not $dryrun -and $isGit) {
if ($src -ne ".") { Push-Location $src } if ($src -ne ".") { Push-Location $src }
git tag $forcearg -a $versionNumber -m "Automated release tag" git tag -a $versionNumber -m "Automated release tag"
if ($LASTEXITCODE -ne 0) { Exit $LASTEXITCODE } if ($LASTEXITCODE -ne 0) { Exit $LASTEXITCODE }
if ($src -ne ".") { Pop-Location } if ($src -ne ".") { Pop-Location }
} }

12
ue-plugin-package.ps1
View File

@ -11,8 +11,6 @@ param (
[switch]$hotfix = $false, [switch]$hotfix = $false,
# Don't incrememnt version # Don't incrememnt version
[switch]$keepversion = $false, [switch]$keepversion = $false,
# Force move tag
[switch]$forcetag = $false,
# Never tag # Never tag
[switch]$notag = $false, [switch]$notag = $false,
# Testing mode; skips clean checks, tags # Testing mode; skips clean checks, tags
@ -43,7 +41,6 @@ function Write-Usage {
Write-Output " -patch : Increment patch version i.e. x.x.[x++].0 (default)" Write-Output " -patch : Increment patch version i.e. x.x.[x++].0 (default)"
Write-Output " -hotfix : Increment hotfix version i.e. x.x.x.[x++]" Write-Output " -hotfix : Increment hotfix version i.e. x.x.x.[x++]"
Write-Output " -keepversion : Keep current version number, doesn't tag unless -forcetag" Write-Output " -keepversion : Keep current version number, doesn't tag unless -forcetag"
Write-Output " -forcetag : Move any existing version tag"
Write-Output " -notag : Don't tag even if updating version" Write-Output " -notag : Don't tag even if updating version"
Write-Output " -test : Testing mode, separate builds, allow dirty working copy" Write-Output " -test : Testing mode, separate builds, allow dirty working copy"
Write-Output " -browse : After packaging, browse the output folder" Write-Output " -browse : After packaging, browse the output folder"
@ -158,14 +155,11 @@ 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
if ((-not ($keepversion -or $notag)) -or $forcetag) { if (-not ($keepversion -or $notag)) {
$forcearg = ""
if ($forcetag) {
$forcearg = "-f"
}
if (-not $test -and -not $dryrun -and $isGit) { if (-not $test -and -not $dryrun -and $isGit) {
if ($src -ne ".") { Push-Location $src } if ($src -ne ".") { Push-Location $src }
git tag $forcearg -a $versionNumber -m "Automated release tag" git tag -a $versionNumber -m "Automated release tag"
if ($LASTEXITCODE -ne 0) { Exit $LASTEXITCODE } if ($LASTEXITCODE -ne 0) { Exit $LASTEXITCODE }
if ($src -ne ".") { Pop-Location } if ($src -ne ".") { Pop-Location }
} }