diff --git a/clients/go/generate-proto.ps1 b/clients/go/generate-proto.ps1 index 85489b0..938f480 100644 --- a/clients/go/generate-proto.ps1 +++ b/clients/go/generate-proto.ps1 @@ -6,7 +6,10 @@ $ErrorActionPreference = 'Stop' # those header stamps, so a regeneration on an off-pin machine would churn the tree and make # check-codegen Check 4 false-fail (or mask real drift under churn). Assert the exact versions # so a regen is deterministic. protoc itself is warn-only (source_code_info is normalized out of -# the committed bindings), matching publish-client-proto-inputs.ps1. +# the committed bindings), matching publish-client-proto-inputs.ps1. On Windows a plugin reports +# its argv[0] name, so the banner carries a trailing `.exe` (e.g. "protoc-gen-go.exe v1.36.11"); +# Get-NormalizedToolVersion strips that suffix before the pin compare so Check 4 runs the same on +# Windows as everywhere else. $PinnedProtocGenGoVersion = 'protoc-gen-go v1.36.11' $PinnedProtocGenGoGrpcVersion = 'protoc-gen-go-grpc 1.6.2' $PinnedProtocVersion = 'libprotoc 34.1' @@ -16,6 +19,14 @@ $protoRoot = Join-Path $repoRoot 'src\ZB.MOM.WW.MxGateway.Contracts\Protos' $outputRoot = Join-Path $PSScriptRoot 'internal\generated' $modulePath = 'gitea.dohertylan.com/dohertj2/mxaccessgw/clients/go/internal/generated' +function Get-NormalizedToolVersion { + # On Windows a plugin reports its argv[0] name, so the banner carries an `.exe` + # suffix ("protoc-gen-go.exe v1.36.11"). Strip it so the pin compare is + # host-independent; the version part must still match exactly. + param([string]$RawBanner) + return ($RawBanner -replace '\.exe(?=\s)', '') +} + function Resolve-Tool { # Resolve a codegen tool from PATH first (portable), then the documented Windows fallbacks, # instead of the previous hard-coded per-machine paths. See docs/ToolchainLinks.md. @@ -51,17 +62,17 @@ $protocGenGoGrpc = Resolve-Tool -Names @('protoc-gen-go-grpc', 'protoc-gen-go-gr # Assert the pinned plugin versions before generating so Check 4 cannot false-fail (or mask drift) # on an off-pin machine. protoc is warn-only. -$protocGenGoVersion = (& $protocGenGo --version 2>&1 | Out-String).Trim() +$protocGenGoVersion = Get-NormalizedToolVersion (& $protocGenGo --version 2>&1 | Out-String).Trim() if ($protocGenGoVersion -ne $PinnedProtocGenGoVersion) { throw "protoc-gen-go reports '$protocGenGoVersion', but regeneration is pinned to '$PinnedProtocGenGoVersion'. " + "Install the pin: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.11" } -$protocGenGoGrpcVersion = (& $protocGenGoGrpc --version 2>&1 | Out-String).Trim() +$protocGenGoGrpcVersion = Get-NormalizedToolVersion (& $protocGenGoGrpc --version 2>&1 | Out-String).Trim() if ($protocGenGoGrpcVersion -ne $PinnedProtocGenGoGrpcVersion) { throw "protoc-gen-go-grpc reports '$protocGenGoGrpcVersion', but regeneration is pinned to '$PinnedProtocGenGoGrpcVersion'. " + "Install the pin: go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.6.2" } -$protocVersion = (& $protoc --version 2>&1 | Out-String).Trim() +$protocVersion = Get-NormalizedToolVersion (& $protoc --version 2>&1 | Out-String).Trim() if ($protocVersion -ne $PinnedProtocVersion) { Write-Warning "protoc reports '$protocVersion', pin is '$PinnedProtocVersion'. Descriptor comments are normalized out of the committed Go bindings, so patch drift is tolerated; keep CI on the pin." }