mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-01-22 20:51:23 -05:00
Fix beta builds with powershell release tool
This commit is contained in:
parent
abfebea4f2
commit
93624c3700
@ -37,7 +37,6 @@ param(
|
||||
[Parameter(ParameterSetName = "merge", Mandatory, Position = 1)]
|
||||
[Parameter(ParameterSetName = "build", Mandatory, Position = 1)]
|
||||
[Parameter(ParameterSetName = "sign", Mandatory, Position = 1)]
|
||||
[ValidatePattern("^[0-9]\.[0-9]\.[0-9]$")]
|
||||
[string] $Version,
|
||||
|
||||
[Parameter(ParameterSetName = "build", Mandatory)]
|
||||
@ -258,7 +257,7 @@ if ($ExtraPath) {
|
||||
$SourceDir = (Resolve-Path $SourceDir).Path
|
||||
|
||||
# Check format of -Version
|
||||
if ($Version -notmatch "^\d+\.\d+\.\d+$") {
|
||||
if ($Version -notmatch "^\d+\.\d+\.\d+(-Beta\d*)?$") {
|
||||
throw "Invalid format for -Version input"
|
||||
}
|
||||
|
||||
@ -349,7 +348,7 @@ if ($Merge) {
|
||||
Remove-Item $OutDir -Recurse
|
||||
}
|
||||
|
||||
if ($Version -match "-beta\\d+$") {
|
||||
if ($Version -match "-beta\d*$") {
|
||||
$CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=PreRelease"
|
||||
} else {
|
||||
$CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=Release"
|
||||
|
Loading…
Reference in New Issue
Block a user