Skip to content

Commit 92e31ee

Browse files
update appveyor.yml to assign unique build numbers even when building tags
1 parent ec326fb commit 92e31ee

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

appveyor.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@ configuration: Release
99
init:
1010
- ps: |
1111
git config --global core.autocrlf true
12-
Write-Host "Appveyor build version: $env:APPVEYOR_BUILD_VERSION"
13-
$version = $env:APPVEYOR_BUILD_VERSION
12+
Write-Host "Original Appveyor build version: $env:APPVEYOR_BUILD_VERSION"
13+
$env:PACKAGE_VERSION = $env:APPVEYOR_BUILD_VERSION
14+
$appveyor_build_version = $env:APPVEYOR_BUILD_VERSION
1415
$env:GIT_HASH=$env:APPVEYOR_REPO_COMMIT.Substring(0, 10)
1516
Write-Host "Git commit hash: $env:GIT_HASH"
1617
If ($env:APPVEYOR_REPO_TAG -and ($env:APPVEYOR_REPO_TAG_NAME -match "^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"))
1718
{
18-
$version=$env:APPVEYOR_REPO_TAG_NAME.Substring(1)
19-
Write-Host "Tagged version: $version"
19+
$env:PACKAGE_VERSION=$env:APPVEYOR_REPO_TAG_NAME.Substring(1)
20+
$appveyor_build_version="$env:PACKAGE_VERSION ($env:APPVEYOR_BUILD_NUMBER)"
21+
Write-Host "Tagged version: $env:PACKAGE_VERSION"
22+
Write-Host "New build version: $appveyor_build_version"
2023
}
21-
$version_split_at_hyphen = $version -split '-'
24+
$version_split_at_hyphen = $env:PACKAGE_VERSION -split '-'
2225
$major_minor_patch = $version_split_at_hyphen[0]
2326
$major_minor_patch_split = $major_minor_patch -split '\.'
2427
$major = $major_minor_patch_split[0]
@@ -28,17 +31,17 @@ init:
2831
If ($major -eq "2") { $minor = "1" }
2932
$env:ASSEMBLY_VERSION = "$major.$minor.0.0"
3033
$env:FILE_VERSION = "$major_minor_patch.0"
31-
$env:INFORMATIONAL_Version = "$version+$env:GIT_HASH"
32-
Write-Host "Computed package version: $version"
34+
$env:INFORMATIONAL_Version = "$env:PACKAGE_VERSION+$env:GIT_HASH"
35+
Write-Host "Computed package version: $env:PACKAGE_VERSION"
3336
Write-Host "Computed assembly version: $env:ASSEMBLY_VERSION"
3437
Write-Host "Computed file version: $env:FILE_VERSION"
3538
Write-Host "Computed info version: $env:INFORMATIONAL_Version"
36-
Update-AppveyorBuild -Version "$version"
39+
Update-AppveyorBuild -Version "$appveyor_build_version"
3740
3841
dotnet_csproj:
3942
patch: true
4043
file: '**\Semver.csproj'
41-
package_version: '{version}'
44+
package_version: '$(PACKAGE_VERSION)'
4245
assembly_version: '$(ASSEMBLY_VERSION)'
4346
file_version: '$(FILE_VERSION)'
4447
informational_version: "$(INFORMATIONAL_Version)"

0 commit comments

Comments
 (0)