From 2e4d058b90936eda9948e91f50419a437ad62661 Mon Sep 17 00:00:00 2001 From: Bill Long Date: Mon, 19 Aug 2024 11:35:39 -0500 Subject: [PATCH] Bring back target branch variable for merge pipeline --- azure-pipeline-merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipeline-merge.yml b/azure-pipeline-merge.yml index f8839aae9d..6bd56cb6f3 100644 --- a/azure-pipeline-merge.yml +++ b/azure-pipeline-merge.yml @@ -28,7 +28,7 @@ extends: displayName: "Spell Check" - pwsh: | cd .\.build - .\CodeFormatter.ps1 -Branch main + .\CodeFormatter.ps1 -Branch $env:TargetBranchName displayName: "Code Formatting Script" condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/release')) env: @@ -39,13 +39,13 @@ extends: displayName: "Build Script" - pwsh: | cd .\.build - .\Pester.ps1 -NoProgress -Branch main + .\Pester.ps1 -NoProgress -Branch $env:TargetBranchName displayName: "Running Invoke-Pester" env: TargetBranchName: $(System.PullRequest.TargetBranch) - pwsh: | cd .\.build - .\ValidateMerge.ps1 -Branch main + .\ValidateMerge.ps1 -Branch $env:TargetBranchName displayName: "Validate commit times" env: TargetBranchName: $(System.PullRequest.TargetBranch)