Add hotfix build support

Author: coreybutler

.github/workflows/release.yml

@@ -22,6 +22,11 @@ on:
         required: false
         default: false
         type: boolean
+      hotfix:
+        description: Optional hotfix stamp (e.g. 1 or hotfix.1 → {manifest}-hotfix.1). Leave empty for manifest version.
+        required: false
+        default: ""
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -110,12 +115,34 @@ jobs:
           PUBLISH_RELEASE: ${{ inputs.publish_release }}
           OVERRIDE_EXISTING_RELEASE: ${{ inputs.override_existing_release }}
           ARCHES: ${{ steps.matrix.outputs.arches }}
+          HOTFIX: ${{ inputs.hotfix }}
         run: |
+          . .\build\common.ps1
+          $null = Initialize-NvmBuildContext
+          # Always read base from on-disk manifest (ignore any prior NVM_CLI_VERSION).
+          $manifestPath = Get-NvmCliManifestPath
+          $baseVersion = [string](Get-Content -LiteralPath $manifestPath -Raw -Encoding UTF8 | ConvertFrom-Json).version
+          if ([string]::IsNullOrWhiteSpace($baseVersion)) {
+            throw "CLI manifest does not define version: $manifestPath"
+          }
+          $effective = Resolve-NvmHotfixVersion -BaseVersion $baseVersion -Hotfix $env:HOTFIX
+          if ($effective -ne $baseVersion) {
+            Write-Host ("Hotfix stamp -> {0} (base {1})" -f $effective, $baseVersion)
+          }
+          else {
+            Write-Host ("Release version -> {0} (no hotfix input)" -f $effective)
+          }
+          [Environment]::SetEnvironmentVariable("NVM_CLI_VERSION", $effective, "Process")
+          if (-not [string]::IsNullOrWhiteSpace($env:GITHUB_ENV)) {
+            Add-Content -LiteralPath $env:GITHUB_ENV -Value "NVM_CLI_VERSION=$effective"
+          }
+
           $archList = @($env:ARCHES -split ',' | ForEach-Object { $_.Trim() } | Where-Object { $_ })
           $gateArgs = @{
             Mode          = "Gate"
             Architectures = $archList
             Enabled       = ($env:PUBLISH_RELEASE -eq "true")
+            Version       = $effective
           }
           if ($env:OVERRIDE_EXISTING_RELEASE -eq "true") {
             $gateArgs["OverrideExisting"] = $true
@@ -135,6 +162,7 @@ jobs:
     env:
       GOBIN: ${{ github.workspace }}\go-bin
       ARCHITECTURE: ${{ matrix.architecture }}
+      NVM_CLI_VERSION: ${{ needs.prepare.outputs.version }}
 
     steps:
       - name: Check GitHub App secrets
@@ -210,6 +238,21 @@ jobs:
             throw "git submodule update failed with exit code $LASTEXITCODE"
           }
 
+      - name: Stamp CLI manifest version (hotfix / gate)
+        env:
+          EFFECTIVE_VERSION: ${{ needs.prepare.outputs.version }}
+        run: |
+          if ([string]::IsNullOrWhiteSpace($env:EFFECTIVE_VERSION)) {
+            throw "prepare.outputs.version empty (cannot stamp cli/src/manifest.json)"
+          }
+          . .\build\common.ps1
+          $null = Initialize-NvmBuildContext
+          $base = (Get-Content -LiteralPath (Get-NvmCliManifestPath) -Raw -Encoding UTF8 | ConvertFrom-Json).version
+          Set-NvmCliManifestVersion -Version $env:EFFECTIVE_VERSION
+          if ($env:EFFECTIVE_VERSION -ne [string]$base) {
+            Write-Host ("Hotfix stamp -> {0} (base {1})" -f $env:EFFECTIVE_VERSION, $base)
+          }
+
       - name: Set up Go
         uses: actions/setup-go@v7
         with:

build/README.md

@@ -51,13 +51,14 @@ Workflow: [Release Community Build](../.github/workflows/release.yml) (`workflow
 | `architecture` | `both` | `amd64`, `arm64`, or both |
 | `publish_release` | true | Draft → upload assets → publish |
 | `override_existing_release` | false | Replace setup.exe **and** sync.exe on existing tag |
+| `hotfix` | _(empty)_ | Optional stamp: `1` or `hotfix.1` → `{manifest}-hotfix.N` without committing `cli/src/manifest.json` |
 
 GitHub Release assets per architecture:
 
 - `nvm---setup.exe` — Inno Setup installer
 - `nvm---sync.exe` — prebuilt sync for `-DownloadSync`
 
-Tag = `v` + `cli/src/manifest.json` `version`.
+Tag = `v` + effective version (`cli/src/manifest.json` version, plus optional `hotfix` stamp). Runner patches manifest before CLI/Inno build so embeds and `AppVersion` match. Inno `VersionInfoVersion` already maps `-hotfix.N` → fourth numeric field (`2.0.1-hotfix.1` → `2.0.1.1`).
 
 ### WinGet
 

build/common.ps1

@@ -43,6 +43,11 @@ function Get-NvmCliManifestPath {
 }
 
 function Get-NvmCliVersion {
+	# GHA / packaging: set NVM_CLI_VERSION (e.g. prepare.outputs.version with hotfix stamp).
+	$fromEnv = [Environment]::GetEnvironmentVariable("NVM_CLI_VERSION")
+	if (-not [string]::IsNullOrWhiteSpace($fromEnv)) {
+		return $fromEnv.Trim()
+	}
 	$manifestPath = Get-NvmCliManifestPath
 	if (-not (Test-Path -LiteralPath $manifestPath -PathType Leaf)) {
 		throw "CLI manifest not found: $manifestPath"
@@ -55,6 +60,67 @@ function Get-NvmCliVersion {
 	return $version
 }
 
+function Resolve-NvmHotfixVersion {
+	param(
+		[Parameter(Mandatory = $true)]
+		[string]$BaseVersion,
+		[string]$Hotfix = ""
+	)
+
+	$base = $BaseVersion.Trim()
+	if ([string]::IsNullOrWhiteSpace($base)) {
+		throw "Resolve-NvmHotfixVersion: BaseVersion is empty"
+	}
+
+	$raw = if ($null -eq $Hotfix) { "" } else { $Hotfix.Trim() }
+	if ([string]::IsNullOrWhiteSpace($raw)) {
+		return $base
+	}
+
+	$suffix = $null
+	if ($raw -match '^\d+$') {
+		$suffix = "hotfix.$raw"
+	}
+	elseif ($raw -match '^(?i)hotfix\.(\d+)$') {
+		$suffix = "hotfix.$($Matches[1])"
+	}
+	else {
+		throw @"
+Resolve-NvmHotfixVersion: invalid hotfix input '$raw'.
+Use empty (no override), a digit run (e.g. 1 -> -hotfix.1), or hotfix.N (e.g. hotfix.1).
+"@
+	}
+
+	return "{0}-{1}" -f $base, $suffix
+}
+
+function Set-NvmCliManifestVersion {
+	param(
+		[Parameter(Mandatory = $true)]
+		[string]$Version
+	)
+
+	$ver = $Version.Trim()
+	if ([string]::IsNullOrWhiteSpace($ver)) {
+		throw "Set-NvmCliManifestVersion: Version is empty"
+	}
+
+	$manifestPath = Get-NvmCliManifestPath
+	if (-not (Test-Path -LiteralPath $manifestPath -PathType Leaf)) {
+		throw "CLI manifest not found: $manifestPath"
+	}
+
+	$manifest = Get-Content -LiteralPath $manifestPath -Raw -Encoding UTF8 | ConvertFrom-Json
+	$before = [string]$manifest.version
+	$manifest.version = $ver
+
+	$json = $manifest | ConvertTo-Json -Depth 30
+	$utf8NoBom = New-Object System.Text.UTF8Encoding $false
+	[System.IO.File]::WriteAllText($manifestPath, ($json.TrimEnd() + "`n"), $utf8NoBom)
+
+	Write-Host ("CLI manifest version -> {0} (was {1}) [{2}]" -f $ver, $before, $manifestPath)
+}
+
 function Initialize-NvmBuildContext {
 	param([string]$BinRoot = "")
 

build/steps/Build-Installer.ps1

@@ -23,13 +23,16 @@ if (-not (Test-Path -LiteralPath $bat -PathType Leaf)) {
 }
 
 $manifest = Get-Content -LiteralPath $manifestPath -Raw -Encoding UTF8 | ConvertFrom-Json
-$version = [string]$manifest.version
+# Prefer gate/hotfix stamp (NVM_CLI_VERSION / patched manifest) over raw file alone.
+$version = $ctx.CliVersion
 $aumid = [string]$manifest.appUserModelId
 $appId = [string]$manifest.appId
 if ([string]::IsNullOrWhiteSpace($version) -or [string]::IsNullOrWhiteSpace($aumid) -or [string]::IsNullOrWhiteSpace($appId)) {
 	throw "installer manifest values (version, appUserModelId, appId) are required"
 }
 
+Write-Host "Installer version -> $version"
+
 # Inno copies bin/.sync/* only when sync.exe exists; keep dir present, no DLLs.
 New-Item -ItemType Directory -Force -Path (Join-Path $ctx.BinRoot ".sync") | Out-Null
 

build/steps/Publish-GitHubRelease.ps1

@@ -459,6 +459,9 @@ Architectures: $noteArches.
 
 Assets per arch: Inno Setup installer (``*-setup.exe``) and prebuilt ``sync.exe`` (``*-sync.exe``) for public ``-DownloadSync`` builds.
 "@
+	if ($Version -match '(?i)-hotfix\.\d+') {
+		$intro += "`n`nHotfix stamp applied at build time via the Community Release ``hotfix`` workflow input (manifest base left unchanged in git)."
+	}
 	$commits = Get-NvmReleaseCommitSummarySection -Tag $Tag -HeadRef $headRef
 	$footer = Get-NvmReleaseNotesFooter
 	return ($intro.TrimEnd() + "`n`n" + $commits.TrimEnd() + $footer)