Skip to content

Commit d3dcb3f

Browse files
Use BuildID to fix race ondition (Azure#16854)
1 parent 5d49308 commit d3dcb3f

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

eng/pipelines/templates/jobs/archetype-sdk-client.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
pwsh: true
1414
workingDirectory: $(Build.SourcesDirectory)
1515
filePath: eng/scripts/SetTestPipelineVersion.ps1
16+
arguments: '-BuildNumber $(Build.BuildNumber)'
1617
- pwsh: |
1718
echo "##vso[build.addbuildtag]Scheduled"
1819
displayName: "Tag scheduled builds"

eng/pipelines/templates/stages/archetype-net-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ stages:
6363
pwsh: true
6464
workingDirectory: $(Build.SourcesDirectory)
6565
filePath: eng/scripts/SetTestPipelineVersion.ps1
66+
arguments: '-BuildNumber $(Build.BuildNumber)'
6667
- template: /eng/common/pipelines/templates/steps/verify-changelog.yml
6768
parameters:
6869
PackageName: ${{artifact.name}}

eng/scripts/SetTestPipelineVersion.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
# Overides the project file and CHANGELOG.md for the template project using the next publishable version
1+
# Overides the project file and CHANGELOG.md for the template project.
22
# This is to help with testing the release pipeline.
3+
4+
param (
5+
[Parameter(mandatory = $true)]
6+
$BuildNumber
7+
)
8+
39
. "${PSScriptRoot}\..\common\scripts\common.ps1"
410
$latestTags = git tag -l "Azure.Template_*"
511
$semVars = @()
@@ -15,7 +21,9 @@ $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
1521
LogDebug "Last Published Version $($semVarsSorted[0])"
1622

1723
$newVersion = [AzureEngSemanticVersion]::ParseVersionString($semVarsSorted[0])
18-
$newVersion.IncrementAndSetToPrerelease()
24+
$newVersion.PrereleaseLabel = "beta"
25+
$newVersion.PrereleaseNumber = $BuildNumber
26+
1927
LogDebug "Version to publish [ $($newVersion.ToString()) ]"
2028

2129
&"${PSScriptRoot}/Update-PkgVersion.ps1" -ServiceDirectory "template" `

0 commit comments

Comments
 (0)