Skip to content

Commit f650f59

Browse files
zivkanzivkan
authored
CI pipelines should work when branch has slash (#6853)
1 parent 90be422 commit f650f59

8 files changed

Lines changed: 19 additions & 22 deletions

File tree

‎eng/pipelines/official.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ variables:
6666
RunMonoTestsOnMac: ${{ parameters.RunMonoTestsOnMac }}
6767
RunStaticAnalysis: ${{ parameters.RunStaticAnalysis }}
6868
OneLocBranch: 'dev'
69+
SourceBranch: $[replace(variables['Build.SourceBranch'], 'refs/heads/', '')]
6970

7071
extends:
7172
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate

‎eng/pipelines/optprof.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ stages:
144144
}
145145
catch {
146146
Write-Host $_
147-
Write-Error "Failed to set SourceBranchName pipeline variable"
147+
Write-Error "Failed to set RunSettingsURI pipeline variable"
148148
throw
149149
}
150150
displayName: 'Set RunSettingsURI variable'
@@ -180,10 +180,10 @@ stages:
180180
filePath: $(DartLab.Path)\Scripts\VisualStudio\Bootstrapper\Get-BootstrapperURL.ps1
181181
arguments: -BootstrapperInfoJsonURI '$(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json' -VSBranch '$(VSBranch)' -OutVariableName 'VisualStudio.InstallationUnderTest.BootstrapperURL'
182182
- task: artifactDropTask@0
183-
displayName: "Upload VSTS Drop"
183+
displayName: "Upload VS Bootstrapper"
184184
inputs:
185185
dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
186-
buildNumber: 'Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
186+
buildNumber: '$(MicroBuild.ManifestDropName)'
187187
sourcePath: "$(Pipeline.Workspace)\\ComponentBuildUnderTest\\VS15"
188188
toLowerCase: false
189189
usePat: true

‎eng/pipelines/pull_request.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ resources:
4646
type: git
4747
name: 1ESPipelineTemplates/MicroBuildTemplate
4848
ref: refs/tags/release
49+
4950
variables:
5051
BINLOG_DIRECTORY: $(Build.StagingDirectory)/binlog
5152
DOTNET_NOLOGO: 1
@@ -61,6 +62,8 @@ variables:
6162
RunTestsOnMac: ${{ parameters.RunTestsOnMac }}
6263
RunMonoTestsOnMac: ${{ parameters.RunMonoTestsOnMac }}
6364
RunStaticAnalysis: ${{ parameters.RunStaticAnalysis }}
65+
SourceBranch: $[replace(variables['Build.SourceBranch'], 'refs/heads/', '')]
66+
6467
extends:
6568
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
6669
parameters:

‎eng/pipelines/templates/Build_and_UnitTest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
- task: PowerShell@1
2020
inputs:
2121
scriptName: "$(Build.Repository.LocalPath)\\scripts\\cibuild\\ConfigureVstsBuild.ps1"
22-
arguments: "-BuildRTM $(BuildRTM) -RepositoryPath $(Build.Repository.LocalPath) -BranchName $(Build.SourceBranchName) -CommitHash $(Build.SourceVersion) -BuildNumber $(Build.BuildNumber)"
22+
arguments: "-BuildRTM $(BuildRTM) -RepositoryPath $(Build.Repository.LocalPath) -BranchName $(SourceBranch) -CommitHash $(Build.SourceVersion) -BuildNumber $(Build.BuildNumber)"
2323
displayName: "Configure VSTS CI Environment"
2424

2525
- task: PowerShell@1
@@ -333,7 +333,7 @@ steps:
333333
displayName: "Generate .runsettings files"
334334
inputs:
335335
solution: 'build\runsettings.proj'
336-
msbuildArguments: '/restore:false /property:OutputPath="$(Build.Repository.LocalPath)\artifacts\RunSettings" /property:TestDrop="RunSettings/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)" /property:ProfilingInputsDrop="ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)" /binarylogger:$(Build.StagingDirectory)\\binlog\\17.GenerateRunSettings.binlog'
336+
msbuildArguments: '/restore:false /property:OutputPath="$(Build.Repository.LocalPath)\artifacts\RunSettings" /property:TestDrop="RunSettings/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildId)" /property:ProfilingInputsDrop="ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildId)" /binarylogger:$(Build.StagingDirectory)\\binlog\\17.GenerateRunSettings.binlog'
337337
condition: "and(succeeded(), eq(variables['BuildRTM'], 'false'))"
338338

339339
- task: PowerShell@1
@@ -400,7 +400,7 @@ steps:
400400
scriptType: ps
401401
scriptLocation: inlineScript
402402
inlineScript: |
403-
$(Agent.TempDirectory)/dotnet/dotnet msbuild $(Build.Repository.LocalPath)\build\publish.proj /t:PublishToBuildAssetRegistry /property:NuGetClientNupkgsDirectoryPath=$(Build.Repository.LocalPath)\artifacts\$(NupkgOutputDir) /property:BUILD_BUILDNUMBER=$(Build.BuildNumber) /property:BUILD_SOURCEBRANCH=$(Build.SourceBranchName) /property:BUILD_SOURCEVERSION=$(Build.SourceVersion) /property:BUILD_REPOSITORY_URI=$(Build.Repository.Uri) /property:BUILD_REPOSITORY_NAME=$(Build.Repository.Name) /property:ArtifactsLogDir=$(Build.Repository.LocalPath)\artifacts\manifests\ /binarylogger:$(Build.StagingDirectory)\binlog\21.PublishToBuildAssetRegistry.binlog /property:MaestroApiEndpoint=$(MaestroApiEndpoint)
403+
$(Agent.TempDirectory)/dotnet/dotnet msbuild $(Build.Repository.LocalPath)\build\publish.proj /t:PublishToBuildAssetRegistry /property:NuGetClientNupkgsDirectoryPath=$(Build.Repository.LocalPath)\artifacts\$(NupkgOutputDir) /property:BUILD_BUILDNUMBER=$(Build.BuildNumber) /property:BUILD_SOURCEBRANCH=$(SourceBranch) /property:BUILD_SOURCEVERSION=$(Build.SourceVersion) /property:BUILD_REPOSITORY_URI=$(Build.Repository.Uri) /property:BUILD_REPOSITORY_NAME=$(Build.Repository.Name) /property:ArtifactsLogDir=$(Build.Repository.LocalPath)\artifacts\manifests\ /binarylogger:$(Build.StagingDirectory)\binlog\21.PublishToBuildAssetRegistry.binlog /property:MaestroApiEndpoint=$(MaestroApiEndpoint)
404404
workingDirectory: cli
405405
failOnStderr: true
406406
env:

‎eng/pipelines/templates/Initialize_Build.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
} else {
2323
$targetMajorVersion = ((& dotnet msbuild $env:BUILD_REPOSITORY_LOCALPATH\build\config.props /restore:false "/ConsoleLoggerParameters:Verbosity=Minimal;NoSummary;ForceNoAlign" /nologo /target:GetVsTargetMajorVersion) | Out-String).Trim()
2424
}
25-
25+
2626
Write-Host "##vso[task.setvariable variable=VsTargetChannel;isOutput=true]$targetChannel"
2727
Write-Host "##vso[task.setvariable variable=VsTargetChannelForTests;isOutput=true]$targetChannelForTests"
2828
Write-Host "##vso[task.setvariable variable=VsTargetMajorVersion;isOutput=true]$targetMajorVersion"
@@ -34,13 +34,5 @@ steps:
3434
exit 1
3535
}
3636
37-
- task: PowerShell@1
38-
displayName: "Add Build Tags"
39-
inputs:
40-
scriptType: "inlineScript"
41-
inlineScript: |
42-
Write-Host "##vso[build.addbuildtag]${env:BUILD_SOURCEVERSIONAUTHOR}"
43-
Write-Host "##vso[build.addbuildtag]${env:BUILD_SOURCEBRANCHNAME}"
44-
4537
- task: ComponentGovernanceComponentDetection@0
4638
displayName: 'Component Detection'

‎eng/pipelines/templates/pipeline.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ stages:
8484
LclSource: lclFilesfromPackage
8585
LclPackageId: 'LCL-JUNO-PROD-NuGetClient'
8686
MirrorRepo: 'NuGet.Client'
87-
MirrorBranch: ${{ variables['Build.SourceBranchName'] }}
87+
MirrorBranch: ${{ variables['SourceBranch'] }}
8888
GitHubOrg: 'NuGet'
8989

9090
- stage: StaticSourceAnalysis
@@ -173,7 +173,7 @@ stages:
173173
displayName: 'Publish the .runsettings files to artifact services'
174174
condition: "succeeded()"
175175
dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
176-
buildNumber: 'RunSettings/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)'
176+
buildNumber: 'RunSettings/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildId)'
177177
sourcePath: 'artifacts\RunSettings'
178178
toLowerCase: false
179179
usePat: true
@@ -185,7 +185,7 @@ stages:
185185
displayName: 'OptProfV2: publish profiling inputs to artifact services'
186186
condition: "and(succeeded(), eq(variables['IsOfficialBuild'], 'true'))"
187187
dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
188-
buildNumber: 'ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)'
188+
buildNumber: 'ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildId)'
189189
sourcePath: '$(Build.ArtifactStagingDirectory)\OptProf\ProfilingInputs'
190190
toLowerCase: false
191191
usePat: true
@@ -208,7 +208,7 @@ stages:
208208
displayName: 'Upload VSTS Drop'
209209
condition: "succeeded()"
210210
dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
211-
buildNumber: 'Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
211+
buildNumber: 'Products/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildNumber)'
212212
sourcePath: "$(Build.Repository.LocalPath)\\artifacts\\VS15"
213213
toLowerCase: false
214214
usePat: true

‎eng/pipelines/vs-test/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
- task: MicroBuildSwixPlugin@4
1111
displayName: "Install Swix Plugin"
1212
inputs:
13-
dropName: "Tests/$(System.TeamProject)/$(Build.DefinitionName)/$(Build.SourceBranchName)/$(Build.BuildId)"
13+
dropName: "Tests/$(System.TeamProject)/$(Build.DefinitionName)/$(SourceBranch)/$(Build.BuildId)"
1414
- task: PowerShell@1
1515
displayName: "Run Configure.ps1"
1616
inputs:
@@ -45,7 +45,7 @@ steps:
4545
- task: PowerShell@1
4646
inputs:
4747
scriptName: "$(Build.Repository.LocalPath)\\scripts\\cibuild\\ConfigureVstsBuild.ps1"
48-
arguments: "-BuildRTM false -RepositoryPath $(Build.Repository.LocalPath) -BranchName $(Build.SourceBranchName) -CommitHash $(Build.SourceVersion) -BuildNumber $(NuGetVersion)"
48+
arguments: "-BuildRTM false -RepositoryPath $(Build.Repository.LocalPath) -BranchName $(SourceBranch) -CommitHash $(Build.SourceVersion) -BuildNumber $(NuGetVersion)"
4949
displayName: "Configure VSTS CI Environment"
5050

5151
- task: PowerShell@1
@@ -214,7 +214,7 @@ steps:
214214
Write-Host "Base Build Drop: $buildDrop"
215215
Write-Host "##vso[task.setvariable variable=BaseBuildDrop;isOutput=true]$buildDrop"
216216
217-
$runSettingsDrop = "RunSettings/${env:System_TeamProject}/${env:Build_DefinitionName}/${env:Build_SourceBranchName}/${env:Build_BuildId}"
217+
$runSettingsDrop = "RunSettings/${env:System_TeamProject}/${env:Build_DefinitionName}/${env:SourceBranch}/${env:Build_BuildId}"
218218
Write-Host "Run Settings Drop: $runSettingsDrop"
219219
Write-Host "##vso[task.setvariable variable=RunSettingsDrop]$runSettingsDrop"
220220
Write-Host "##vso[task.setvariable variable=RunSettingsDrop;isOutput=true]$runSettingsDrop"

‎eng/pipelines/vs-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ variables:
6262
DOTNET_NOLOGO: 1
6363
CI: true
6464
Codeql.Enabled: false
65+
SourceBranch: $[replace(variables['Build.SourceBranch'], 'refs/heads/', '')]
6566

6667
stages:
6768
- stage: Build

0 commit comments

Comments
 (0)