Skip to content

Commit 96f5c3f

Browse files
committed
Add extra logging to sourceBranch and publicSourceBranch
1 parent d2eb79c commit 96f5c3f

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

eng/common/templates/steps/init-common.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ parameters:
33

44
steps:
55
- powershell: |
6-
$sourceBranch=$Env:BUILD_SOURCEBRANCH -replace "refs/heads/","" -replace "refs/tags/","" -replace "refs/pull/",""
6+
echo "Env:BUILD_SOURCEBRANCH: $Env:BUILD_SOURCEBRANCH"
7+
$sourceBranch=$Env:BUILD_SOURCEBRANCH -replace "refs/heads/","" -replace "refs/tags/","" -replace "refs/pull/",""
8+
echo "Setting sourceBranch to $sourceBranch"
79
echo "##vso[task.setvariable variable=sourceBranch]$sourceBranch"
810
displayName: Define Source Branch Variable
911
condition: and(succeeded(), ${{ parameters.condition }})
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
steps:
22
- powershell: |
3+
echo "Env:PUBLICSOURCEBRANCH: $Env:PUBLICSOURCEBRANCH"
4+
echo "Env:SYSTEM_PULLREQUEST_TARGETBRANCH: $Env:SYSTEM_PULLREQUEST_TARGETBRANCH"
5+
echo "sourceBranch: $(sourceBranch)"
6+
37
# publicSourceBranch is not necessarily the working branch, it is the branch referenced in the readme Dockerfile source links
48
if ($env:PUBLICSOURCEBRANCH) {
9+
echo 'Setting publicSourceBranch from environment variable $env:PUBLICSOURCEBRANCH'
510
$publicSourceBranch = $env:PUBLICSOURCEBRANCH
611
}
712
elseif (-not "$(manifest)".Contains("samples") -and ("$(sourceBranch)" -eq "nightly" -or $env:SYSTEM_PULLREQUEST_TARGETBRANCH -eq "nightly")) {
13+
echo 'Setting publicSourceBranch to nightly because sourceBranch is nightly or $env:SYSTEM_PULLREQUEST_TARGETBRANCH is nightly'
814
$publicSourceBranch = "nightly"
915
}
1016
else {
17+
echo 'Setting publicSourceBranch to main because sourceBranch is not nightly and $env:SYSTEM_PULLREQUEST_TARGETBRANCH is not nightly'
18+
echo 'This behavior can be overridden by setting $env:PUBLICSOURCEBRANCH'
1119
$publicSourceBranch = "main"
1220
}
1321
22+
echo "publicSourceBranch: $publicSourceBranch"
1423
echo "##vso[task.setvariable variable=publicSourceBranch]$publicSourceBranch"
1524
displayName: Set Public Source Branch Var

0 commit comments

Comments
 (0)