Skip to content

Commit

Permalink
Steps/ApplyAdoBranchNameWorkaround.yml: Fix error from conflict resol…
Browse files Browse the repository at this point in the history
…ution (#11)

Commit d6d4f56 introduced an error during conflict resolution that
adds an extra "condition" member to the powershell step.

The extra "condition" is removed in this change.

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
  • Loading branch information
makubacki authored Oct 17, 2022
1 parent 9ec01a6 commit 0785b56
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Steps/ApplyAdoBranchNameWorkaround.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ steps:
$TargetBranch = "$(System.PullRequest.targetBranch)".replace('refs/heads/', '');
Write-Host "##vso[task.setvariable variable=pr_compare_branch]origin/$TargetBranch";
displayName: Apply Branch Name Workaround
condition: condition: and(eq(variables['Build.Reason'], 'PullRequest'), contains(variables['System.PullRequest.TargetBranch'], 'refs/heads/'))
condition: and(eq(variables['Build.Reason'], 'PullRequest'), contains(variables['System.PullRequest.TargetBranch'], 'refs/heads/'))

0 comments on commit 0785b56

Please # to comment.