Skip to content

Commit 766afbd

Browse files
authored
Pull publish data directly from branch (#80308)
* Pull publish data from current branch * delete unused param
1 parent f219cbc commit 766afbd

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

azure-pipelines-official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ extends:
403403
componentPassword: $(dn-bot-dnceng-build-e-code-full-release-e-packaging-r)
404404
componentBuildProjectName: internal
405405
sourceBranch: "$(ComponentBranchName)"
406-
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
406+
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&version=$(ComponentBranchName)&api-version=6.0"
407407
publishDataAccessToken: "$(System.AccessToken)"
408408
dropPath: '$(Pipeline.Workspace)\VSSetup'
409409
cherryPick: ${{ parameters.VisualStudioCherryPickSHA }}

azure-pipelines-pr-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ extends:
357357
vsBranchName: ${{ parameters.VisualStudioBranchName }}
358358
titlePrefix: ${{ parameters.OptionalTitlePrefix }}
359359
sourceBranch: $(ComponentBranchName)
360-
publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
360+
publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/$(ComponentBranchName)/eng/config/PublishData.json"
361361
queueSpeedometerValidation: true
362362
dropPath: '$(Pipeline.Workspace)\VSSetup'
363363
retainInsertedBuild: false

eng/build-utils.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $ErrorActionPreference="Stop"
88

99
$VSSetupDir = Join-Path $ArtifactsDir "VSSetup\$configuration"
1010
$PackagesDir = Join-Path $ArtifactsDir "packages\$configuration"
11-
$PublishDataUrl = "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
1211

1312
$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $false }
1413
$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { $false }
@@ -27,8 +26,10 @@ function GetPublishData() {
2726
return $global:_PublishData
2827
}
2928

30-
Write-Host "Downloading $PublishDataUrl"
31-
$content = (Invoke-WebRequest -Uri $PublishDataUrl -UseBasicParsing).Content
29+
$publishDataFile = Join-Path $PSScriptRoot "config\PublishData.json"
30+
31+
Write-Host "Reading $publishDataFile"
32+
$content = Get-Content -Path $publishDataFile -Raw
3233

3334
return $global:_PublishData = ConvertFrom-Json $content
3435
}

0 commit comments

Comments
 (0)