Merge pull request #1321 from json-api-dotnet/fix-github-actions-package-version

bkoelman · web-flow · commit 9bdcf339de0f · 2023-09-18T00:35:52.000+02:00
GitHub Actions: Fix the missing branch name in NuGet package version on PR merge
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -97,7 +97,7 @@ jobs:
         else {
             # Get the version suffix from the auto-incrementing build number. For example: '123' => 'master-00123'
             $revision = "{0:D5}" -f [convert]::ToInt32($env:GITHUB_RUN_NUMBER, 10)
-            $versionSuffix = "$($env:GITHUB_HEAD_REF ?? $env:GITHUB_REF_NAME)-$revision"
+            $versionSuffix = "$(![string]::IsNullOrEmpty($env:GITHUB_HEAD_REF) ? $env:GITHUB_HEAD_REF : $env:GITHUB_REF_NAME)-$revision"
         }
         Write-Output "Using version suffix: $versionSuffix"
         Write-Output "PACKAGE_VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ jobs:`
`97`	`97`	`else {`
`98`	`98`	`# Get the version suffix from the auto-incrementing build number. For example: '123' => 'master-00123'`
`99`	`99`	`$revision = "{0:D5}" -f [convert]::ToInt32($env:GITHUB_RUN_NUMBER, 10)`
`100`		`- $versionSuffix = "$($env:GITHUB_HEAD_REF ?? $env:GITHUB_REF_NAME)-$revision"`
	`100`	`+ $versionSuffix = "$(![string]::IsNullOrEmpty($env:GITHUB_HEAD_REF) ? $env:GITHUB_HEAD_REF : $env:GITHUB_REF_NAME)-$revision"`
`101`	`101`	`}`
`102`	`102`	`Write-Output "Using version suffix: $versionSuffix"`
`103`	`103`	`Write-Output "PACKAGE_VERSION_SUFFIX=$versionSuffix" \| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append`