Skip to content

Commit 84f1018

Browse files
raych1azure-sdk
authored andcommitted
Added 'ArtifactsJson' parameter
1 parent 5bfecee commit 84f1018

File tree

2 files changed

+111
-33
lines changed

2 files changed

+111
-33
lines changed

eng/common/pipelines/templates/steps/set-test-pipeline-version.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
parameters:
2-
PackageName: ''
3-
PackageNames: ''
4-
ServiceDirectory: ''
5-
TagSeparator: '_'
6-
TestPipeline: false
2+
- name: PackageName
3+
type: string
4+
default: ''
5+
- name: PackageNames
6+
type: string
7+
default: ''
8+
- name: ServiceDirectory
9+
type: string
10+
default: ''
11+
- name: TagSeparator
12+
type: string
13+
default: '_'
14+
- name: TestPipeline
15+
type: boolean
16+
default: false
17+
- name: ArtifactsJson
18+
type: string
19+
default: ''
720

821
steps:
922
- ${{ if eq(parameters.TestPipeline, 'true') }}:
@@ -18,4 +31,5 @@ steps:
1831
-PackageNames '${{ coalesce(parameters.PackageName, parameters.PackageNames) }}'
1932
-ServiceDirectory '${{ parameters.ServiceDirectory }}'
2033
-TagSeparator '${{ parameters.TagSeparator }}'
34+
-ArtifactsJson '${{ parameters.ArtifactsJson }}'
2135
pwsh: true

eng/common/scripts/SetTestPipelineVersion.ps1

Lines changed: 92 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,120 @@
33
param (
44
[Parameter(mandatory = $true)]
55
[string]$BuildID,
6-
[Parameter(mandatory = $true)]
7-
[string]$PackageNames,
6+
[Parameter(mandatory = $false)]
7+
[string]$PackageNames = "",
88
[Parameter(mandatory = $true)]
99
[string]$ServiceDirectory,
1010
[Parameter(mandatory = $false)]
11-
[string]$TagSeparator = "_"
11+
[string]$TagSeparator = "_",
12+
[Parameter(mandatory = $false)]
13+
[string]$ArtifactsJson = ""
1214
)
1315

1416
. (Join-Path $PSScriptRoot common.ps1)
1517

1618
Write-Host "PackageNames: $PackageNames"
1719
Write-Host "ServiceDirectory: $ServiceDirectory"
1820
Write-Host "BuildID: $BuildID"
21+
Write-Host "ArtifactsJson: $ArtifactsJson"
1922

2023
$packageNamesArray = @()
2124

22-
if ([String]::IsNullOrWhiteSpace($PackageNames)) {
23-
LogError "PackageNames cannot be empty."
24-
exit 1
25+
# If ArtifactsJson is provided, extract package names from it
26+
if (![String]::IsNullOrWhiteSpace($ArtifactsJson)) {
27+
Write-Host "Using ArtifactsJson to determine package names"
28+
try {
29+
$artifacts = $ArtifactsJson | ConvertFrom-Json
30+
$packageNamesArray = $artifacts | ForEach-Object { $_.name }
31+
Write-Host "Extracted package names from ArtifactsJson: $($packageNamesArray -join ', ')"
32+
}
33+
catch {
34+
LogError "Failed to parse ArtifactsJson: $($_.Exception.Message)"
35+
exit 1
36+
}
2537
}
26-
else {
38+
elseif (![String]::IsNullOrWhiteSpace($PackageNames)) {
2739
$packageNamesArray = $PackageNames.Split(',')
2840
}
41+
else {
42+
LogError "Either PackageNames or ArtifactsJson must be provided."
43+
exit 1
44+
}
2945

30-
foreach ($packageName in $packageNamesArray) {
31-
Write-Host "Processing $packageName"
32-
$newVersion = [AzureEngSemanticVersion]::new("1.0.0")
33-
$prefix = "$packageName$TagSeparator"
34-
Write-Host "Get Latest Tag : git tag -l $prefix*"
35-
$latestTags = git tag -l "$prefix*"
46+
# Process packages with appropriate groupId
47+
if (![String]::IsNullOrWhiteSpace($ArtifactsJson)) {
48+
# When using ArtifactsJson, process each artifact with its specific groupId
49+
try {
50+
$artifacts = $ArtifactsJson | ConvertFrom-Json
51+
foreach ($artifact in $artifacts) {
52+
$packageName = $artifact.name
53+
$groupId = $artifact.groupId
3654

37-
$semVars = @()
55+
Write-Host "Processing $packageName with groupId $groupId"
56+
$newVersion = [AzureEngSemanticVersion]::new("1.0.0")
57+
# Use groupId+artifactName format for tag prefix (e.g., "com.azure.v2+azure-sdk-template_")
58+
$prefix = "$groupId+$packageName$TagSeparator"
59+
Write-Host "Get Latest Tag : git tag -l $prefix*"
60+
$latestTags = git tag -l "$prefix*"
3861

39-
if ($latestTags -and ($latestTags.Length -gt 0)) {
40-
foreach ($tag in $latestTags) {
41-
$semVars += $tag.Substring($prefix.Length)
42-
}
62+
$semVars = @()
4363

44-
$semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
45-
Write-Host "Last Published Version $($semVarsSorted[0])"
46-
$newVersion = [AzureEngSemanticVersion]::new($semVarsSorted[0])
64+
if ($latestTags -and ($latestTags.Length -gt 0)) {
65+
foreach ($tag in $latestTags) {
66+
$semVars += $tag.Substring($prefix.Length)
67+
}
68+
69+
$semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
70+
Write-Host "Last Published Version $($semVarsSorted[0])"
71+
$newVersion = [AzureEngSemanticVersion]::new($semVarsSorted[0])
72+
}
73+
74+
$newVersion.PrereleaseLabel = $newVersion.DefaultPrereleaseLabel
75+
$newVersion.PrereleaseNumber = $BuildID
76+
$newVersion.IsPrerelease = $True
77+
78+
Write-Host "Version to publish [ $($newVersion.ToString()) ]"
79+
80+
SetPackageVersion -PackageName $packageName `
81+
-Version $newVersion.ToString() `
82+
-ServiceDirectory $ServiceDirectory `
83+
-GroupId $groupId
84+
}
85+
}
86+
catch {
87+
LogError "Failed to process ArtifactsJson: $($_.Exception.Message)"
88+
exit 1
4789
}
90+
} else {
91+
# Fallback to original logic when using PackageNames string
92+
foreach ($packageName in $packageNamesArray) {
93+
Write-Host "Processing $packageName"
94+
$newVersion = [AzureEngSemanticVersion]::new("1.0.0")
95+
# For legacy PackageNames, assume com.azure groupId for backward compatibility
96+
$prefix = "com.azure+$packageName$TagSeparator"
97+
Write-Host "Get Latest Tag : git tag -l $prefix*"
98+
$latestTags = git tag -l "$prefix*"
4899

49-
$newVersion.PrereleaseLabel = $newVersion.DefaultPrereleaseLabel
50-
$newVersion.PrereleaseNumber = $BuildID
51-
$newVersion.IsPrerelease = $True
100+
$semVars = @()
52101

53-
Write-Host "Version to publish [ $($newVersion.ToString()) ]"
102+
if ($latestTags -and ($latestTags.Length -gt 0)) {
103+
foreach ($tag in $latestTags) {
104+
$semVars += $tag.Substring($prefix.Length)
105+
}
54106

55-
SetPackageVersion -PackageName $packageName `
56-
-Version $newVersion.ToString() `
57-
-ServiceDirectory $ServiceDirectory
107+
$semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
108+
Write-Host "Last Published Version $($semVarsSorted[0])"
109+
$newVersion = [AzureEngSemanticVersion]::new($semVarsSorted[0])
110+
}
111+
112+
$newVersion.PrereleaseLabel = $newVersion.DefaultPrereleaseLabel
113+
$newVersion.PrereleaseNumber = $BuildID
114+
$newVersion.IsPrerelease = $True
115+
116+
Write-Host "Version to publish [ $($newVersion.ToString()) ]"
117+
118+
SetPackageVersion -PackageName $packageName `
119+
-Version $newVersion.ToString() `
120+
-ServiceDirectory $ServiceDirectory
121+
}
58122
}

0 commit comments

Comments
 (0)