From 1e26a0e8a47e08eb3297d45552dfe7cba740d711 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Mon, 17 Oct 2022 16:26:34 -0400 Subject: [PATCH] Steps/ApplyAdoBranchNameWorkaround.yml: Fix error from conflict resolution Commit d6d4f56 introduced an error during conflict resolution that adds an extra "condition" member to the powershell step. The extra line is removed in this change. Signed-off-by: Michael Kubacki --- Steps/ApplyAdoBranchNameWorkaround.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Steps/ApplyAdoBranchNameWorkaround.yml b/Steps/ApplyAdoBranchNameWorkaround.yml index 34c56b54..f8b2ad3c 100644 --- a/Steps/ApplyAdoBranchNameWorkaround.yml +++ b/Steps/ApplyAdoBranchNameWorkaround.yml @@ -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/'))