Merge branch 'main' into CalLogUpdateDeletedMB

microsoft · Aug 19, 2024 · 7268e92 · 7268e92
2 parents 4cc8c73 + 1e7079c
commit 7268e92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 90 deletions.
diff --git 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)
diff --git a/azure-pipeline-release.yml b/azure-pipeline-release.yml