Skip to content
This repository was archived by the owner on Jul 16, 2026. It is now read-only.

Commit 0888d1f

Browse files
MariusStorhaugMariusStorhaug
committed
refactor: remove Get-DevVersion, reuse Get-NextModuleVersion with synthesized decision
Non-publishable builds now pass a synthesized prerelease decision (patch bump + prerelease flag) to the existing Get-NextModuleVersion function — no separate function needed. The original decision is preserved for Write-ActionOutput so CreateRelease stays false.
1 parent ac4f7b1 commit 0888d1f

3 files changed

Lines changed: 46 additions & 112 deletions

File tree

‎scripts/Helpers.psm1‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -586,83 +586,6 @@ function Get-NextModuleVersion {
586586
}
587587
}
588588

589-
function Get-DevVersion {
590-
<#
591-
.SYNOPSIS
592-
Calculates a development prerelease version for non-publishable builds.
593-
594-
.DESCRIPTION
595-
When no release will be created, produces a patch-bumped prerelease version
596-
using the branch name as the prerelease identifier. This ensures every build
597-
receives a valid, unique version even when no publish will occur.
598-
599-
.OUTPUTS
600-
PSSemVer representing the development version.
601-
602-
.EXAMPLE
603-
$devVersion = Get-DevVersion -LatestVersion $latestVersion -Decision $decision `
604-
-Configuration $config -ModuleName 'MyModule' -Releases $releases
605-
#>
606-
[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSReviewUnusedParameter', '',
607-
Justification = 'Parameter is used inside LogGroup script block.')]
608-
[CmdletBinding()]
609-
[OutputType([object])]
610-
param(
611-
# The current latest published version.
612-
[Parameter(Mandatory)]
613-
[object] $LatestVersion,
614-
615-
# The release decision object.
616-
[Parameter(Mandatory)]
617-
[PSCustomObject] $Decision,
618-
619-
# The publish configuration object.
620-
[Parameter(Mandatory)]
621-
[PSCustomObject] $Configuration,
622-
623-
# The name of the module.
624-
[Parameter(Mandatory)]
625-
[ValidateNotNullOrEmpty()]
626-
[string] $ModuleName,
627-
628-
# The GitHub releases list, used for incremental prerelease calculation.
629-
[Parameter(Mandatory)]
630-
[array] $Releases
631-
)
632-
633-
LogGroup 'Calculate development version' {
634-
$newVersion = New-PSSemVer -Version $LatestVersion
635-
$newVersion.Prefix = $Configuration.VersionPrefix
636-
637-
Write-Host 'No publish required. Generating development prerelease version.'
638-
Write-Host 'Incrementing patch version.'
639-
$newVersion.BumpPatch()
640-
641-
$prereleaseName = $Decision.PrereleaseName
642-
Write-Host "Adding prerelease tag using branch name [$prereleaseName]."
643-
$newVersion.Prerelease = $prereleaseName
644-
645-
if (-not [string]::IsNullOrEmpty($Configuration.DatePrereleaseFormat)) {
646-
Write-Host "Using date-based prerelease format: [$($Configuration.DatePrereleaseFormat)]."
647-
$newVersion.Prerelease += "$(Get-Date -Format $Configuration.DatePrereleaseFormat)"
648-
}
649-
650-
if ($Configuration.IncrementalPrerelease) {
651-
$baseVersionString = "$($newVersion.Major).$($newVersion.Minor).$($newVersion.Patch)"
652-
$params = @{
653-
ModuleName = $ModuleName
654-
BaseVersion = $baseVersionString
655-
PrereleaseName = $prereleaseName
656-
Releases = $Releases
657-
}
658-
$newVersion.Prerelease += Get-NextPrereleaseNumber @params
659-
}
660-
661-
Write-Host "Development version: [$($newVersion.ToString())]"
662-
$newVersion
663-
}
664-
}
665-
666589
function Write-ActionOutput {
667590
<#
668591
.SYNOPSIS

‎scripts/main.ps1‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,28 @@ $ghVersion = Get-LatestGitHubVersion -Releases $releases
1616
$psGalleryVersion = Get-LatestPSGalleryVersion -ModuleName $actionInput.Name
1717
$latestVersion = Get-LatestPublishedVersion -GitHubVersion $ghVersion -PSGalleryVersion $psGalleryVersion
1818

19-
if ($decision.ShouldPublish) {
20-
$params = @{
21-
LatestVersion = $latestVersion
22-
Decision = $decision
23-
Configuration = $config
24-
ModuleName = $actionInput.Name
25-
Releases = $releases
26-
}
27-
$newVersion = Get-NextModuleVersion @params
19+
$versionDecision = if ($decision.ShouldPublish) {
20+
$decision
2821
} else {
29-
$newVersion = Get-DevVersion -LatestVersion $latestVersion -Decision $decision -Configuration $config -ModuleName $actionInput.Name -Releases $releases
22+
[PSCustomObject]@{
23+
ShouldPublish = $true
24+
CreateRelease = $false
25+
CreatePrerelease = $true
26+
MajorRelease = $false
27+
MinorRelease = $false
28+
PatchRelease = $true
29+
HasVersionBump = $true
30+
PrereleaseName = $decision.PrereleaseName
31+
}
32+
}
33+
34+
$params = @{
35+
LatestVersion = $latestVersion
36+
Decision = $versionDecision
37+
Configuration = $config
38+
ModuleName = $actionInput.Name
39+
Releases = $releases
3040
}
41+
$newVersion = Get-NextModuleVersion @params
3142

3243
Write-ActionOutput -Decision $decision -NewVersion $newVersion

‎tests/Helpers.Tests.ps1‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BeforeAll {
1717
Import-Module -Name "$PSScriptRoot/../scripts/Helpers.psm1" -Force
1818
}
1919

20-
Describe 'Get-DevVersion' {
20+
Describe 'Non-publishable builds emit a prerelease version via Get-NextModuleVersion' {
2121
BeforeAll {
2222
$baseConfig = [PSCustomObject]@{
2323
AutoPatching = $false
@@ -34,62 +34,62 @@ Describe 'Get-DevVersion' {
3434
$emptyReleases = @([PSCustomObject]@{ tagName = 'v0.0.0'; isLatest = $false; isPrerelease = $false })
3535
}
3636

37-
It 'Emits a version when ReleaseType is None' {
37+
It 'Emits a version when ReleaseType is None (synthesized prerelease decision)' {
3838
$decision = [PSCustomObject]@{
39-
ShouldPublish = $false
39+
ShouldPublish = $true
4040
CreateRelease = $false
41-
CreatePrerelease = $false
41+
CreatePrerelease = $true
4242
MajorRelease = $false
4343
MinorRelease = $false
44-
PatchRelease = $false
45-
HasVersionBump = $false
44+
PatchRelease = $true
45+
HasVersionBump = $true
4646
PrereleaseName = 'featurebranch'
4747
}
4848
$latestVersion = New-PSSemVer -Version '1.2.3'
4949

50-
$result = Get-DevVersion -LatestVersion $latestVersion -Decision $decision `
50+
$result = Get-NextModuleVersion -LatestVersion $latestVersion -Decision $decision `
5151
-Configuration $baseConfig -ModuleName 'TestModule' -Releases $emptyReleases
5252

5353
$result | Should -Not -BeNullOrEmpty
5454
"$($result.Major).$($result.Minor).$($result.Patch)" | Should -Be '1.2.4'
5555
$result.Prerelease | Should -Be 'featurebranch'
5656
}
5757

58-
It 'Emits a version when ignore label is present' {
58+
It 'Emits a version when ignore label is present (synthesized prerelease decision)' {
5959
$decision = [PSCustomObject]@{
60-
ShouldPublish = $false
61-
CreateRelease = $true
62-
CreatePrerelease = $false
60+
ShouldPublish = $true
61+
CreateRelease = $false
62+
CreatePrerelease = $true
6363
MajorRelease = $false
6464
MinorRelease = $false
65-
PatchRelease = $false
66-
HasVersionBump = $false
65+
PatchRelease = $true
66+
HasVersionBump = $true
6767
PrereleaseName = 'mybranch'
6868
}
6969
$latestVersion = New-PSSemVer -Version '2.0.0'
7070

71-
$result = Get-DevVersion -LatestVersion $latestVersion -Decision $decision `
71+
$result = Get-NextModuleVersion -LatestVersion $latestVersion -Decision $decision `
7272
-Configuration $baseConfig -ModuleName 'TestModule' -Releases $emptyReleases
7373

7474
$result | Should -Not -BeNullOrEmpty
7575
"$($result.Major).$($result.Minor).$($result.Patch)" | Should -Be '2.0.1'
7676
$result.Prerelease | Should -Be 'mybranch'
7777
}
7878

79-
It 'Emits a version when no version bump label and AutoPatching is false' {
79+
It 'Emits a version when no version bump label and AutoPatching is false (synthesized prerelease decision)' {
8080
$decision = [PSCustomObject]@{
81-
ShouldPublish = $false
81+
ShouldPublish = $true
8282
CreateRelease = $false
83-
CreatePrerelease = $false
83+
CreatePrerelease = $true
8484
MajorRelease = $false
8585
MinorRelease = $false
86-
PatchRelease = $false
87-
HasVersionBump = $false
86+
PatchRelease = $true
87+
HasVersionBump = $true
8888
PrereleaseName = 'fixsomething'
8989
}
9090
$latestVersion = New-PSSemVer -Version '0.0.0'
9191

92-
$result = Get-DevVersion -LatestVersion $latestVersion -Decision $decision `
92+
$result = Get-NextModuleVersion -LatestVersion $latestVersion -Decision $decision `
9393
-Configuration $baseConfig -ModuleName 'TestModule' -Releases $emptyReleases
9494

9595
$result | Should -Not -BeNullOrEmpty
@@ -99,18 +99,18 @@ Describe 'Get-DevVersion' {
9999

100100
It 'Applies version prefix from configuration' {
101101
$decision = [PSCustomObject]@{
102-
ShouldPublish = $false
102+
ShouldPublish = $true
103103
CreateRelease = $false
104-
CreatePrerelease = $false
104+
CreatePrerelease = $true
105105
MajorRelease = $false
106106
MinorRelease = $false
107-
PatchRelease = $false
108-
HasVersionBump = $false
107+
PatchRelease = $true
108+
HasVersionBump = $true
109109
PrereleaseName = 'dev'
110110
}
111111
$latestVersion = New-PSSemVer -Version '1.0.0'
112112

113-
$result = Get-DevVersion -LatestVersion $latestVersion -Decision $decision `
113+
$result = Get-NextModuleVersion -LatestVersion $latestVersion -Decision $decision `
114114
-Configuration $baseConfig -ModuleName 'TestModule' -Releases $emptyReleases
115115

116116
$result.Prefix | Should -Be 'v'

0 commit comments

Comments
 (0)