Skip to content

Commit 35f8631

Browse files
Use BuildID to fix race ondition (Azure#17459)
1 parent d4084a0 commit 35f8631

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
@@ -62,6 +62,7 @@ jobs:
6262
pwsh: true
6363
workingDirectory: $(Build.SourcesDirectory)
6464
filePath: eng/scripts/SetTestPipelineVersion.ps1
65+
arguments: '-BuildNumber $(Build.BuildNumber)'
6566

6667
- script: |
6768
echo "##vso[build.addbuildtag]Scheduled"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ stages:
7070
pwsh: true
7171
workingDirectory: $(Build.SourcesDirectory)
7272
filePath: eng/scripts/SetTestPipelineVersion.ps1
73+
arguments: '-BuildNumber $(Build.BuildNumber)'
7374

7475
- task: UsePythonVersion@0
7576
displayName: 'Use Python 3.6'

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-sdk-template_*"
511
$semVars = @()
@@ -16,7 +22,9 @@ $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
1622
LogDebug "Last Published Version $($semVarsSorted[0])"
1723

1824
$newVersion = [AzureEngSemanticVersion]::ParseVersionString($semVarsSorted[0])
19-
$newVersion.IncrementAndSetToPrerelease()
25+
$newVersion.PrereleaseLabel = "beta"
26+
$newVersion.PrereleaseNumber = $BuildNumber
27+
2028
LogDebug "Version to publish [ $($newVersion.ToString()) ]"
2129

2230
$pomFileContent = New-Object -TypeName XML

0 commit comments

Comments
 (0)