[CI] Fix build reason if and uses a better branch name. (#11690)
This commit is contained in:
Родитель
19bafa46e9
Коммит
97e34bc451
|
@ -31,14 +31,14 @@ steps:
|
||||||
Write-Host "##vso[task.setvariable variable=BuildId;isOutput=true]$($config.BuildId)"
|
Write-Host "##vso[task.setvariable variable=BuildId;isOutput=true]$($config.BuildId)"
|
||||||
Write-Host "##vso[task.setvariable variable=Commit;isOutput=true]$($config.Commit)"
|
Write-Host "##vso[task.setvariable variable=Commit;isOutput=true]$($config.Commit)"
|
||||||
# calculate branch name and destination dir
|
# calculate branch name and destination dir
|
||||||
$branchName = "$($config.BuildSourceBranchName)/$($config.Commit)/$($config.BuildId)"
|
$branchName = ""
|
||||||
$prefix = ""
|
if ($config.BuildReason -eq "PullRequest") {
|
||||||
if ($Env:OriginalBuildReason -eq "PullRequest") {
|
$branchName = "pr/PR$($config.Commit)"
|
||||||
$prefix = "pr"
|
|
||||||
} else {
|
} else {
|
||||||
$prefix = "ci"
|
$branchName = "ci/$($config.BuildSourceBranchName)/$($config.Commit)"
|
||||||
}
|
}
|
||||||
$branchName = "$prefix/$branchName"
|
|
||||||
|
$branchName = "$branchName/$($config.BuildId)"
|
||||||
Write-Host "##vso[task.setvariable variable=PublishingBranchName;isOutput=true]$branchName"
|
Write-Host "##vso[task.setvariable variable=PublishingBranchName;isOutput=true]$branchName"
|
||||||
Write-Host "##vso[task.setvariable variable=PublishingPath;isOutput=true]$branchName"
|
Write-Host "##vso[task.setvariable variable=PublishingPath;isOutput=true]$branchName"
|
||||||
name: configuration
|
name: configuration
|
||||||
|
@ -111,11 +111,10 @@ steps:
|
||||||
|
|
||||||
git add $Env:PublishingPath
|
git add $Env:PublishingPath
|
||||||
git commit -m"[CI] Add test results for build $Env:OriginalBuildId"
|
git commit -m"[CI] Add test results for build $Env:OriginalBuildId"
|
||||||
git push origin $Env:PublishingBranchName
|
git push origin $Env:PublishingBranchName -f
|
||||||
displayName: 'Add files and clean logs'
|
displayName: 'Add files and clean logs'
|
||||||
timeoutInMinutes: 30
|
timeoutInMinutes: 30
|
||||||
env:
|
env:
|
||||||
PublishingPath: $(configuration.PublishingPath)
|
PublishingPath: $(configuration.PublishingPath)
|
||||||
OriginalBuildId: $(configuration.BuildId)
|
OriginalBuildId: $(configuration.BuildId)
|
||||||
PublishingBranchName: $(configuration.PublishingBranchName)
|
PublishingBranchName: $(configuration.PublishingBranchName)
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче