Skip to content

Commit

Permalink
Bring back target branch variable for merge pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
bill-long committed Aug 19, 2024
1 parent 077cde5 commit 2e4d058
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions azure-pipeline-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)

0 comments on commit 2e4d058

Please sign in to comment.