Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions build-system/azure-pipeline.mntr-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@ jobs:
inputs:
packageType: 'sdk'
useGlobalJson: true

# Set the Incrementalist base branch based on PR target branch
- pwsh: |
if ('$(Build.Reason)' -eq 'PullRequest') {
# Extract branch name from refs/heads/branch format
$targetBranch = '$(System.PullRequest.TargetBranch)'.Replace('refs/heads/', '')
Write-Host "PR detected - using base branch: $targetBranch"
Write-Host "##vso[task.setvariable variable=IncrementalistBaseBranch]$targetBranch"
} else {
Write-Host "Not a PR - using default base branch: dev"
Write-Host "##vso[task.setvariable variable=IncrementalistBaseBranch]dev"
}
displayName: 'Set Incrementalist base branch'

- script: dotnet tool restore
displayName: 'Restore dotnet tools'
Expand Down
13 changes: 13 additions & 0 deletions build-system/azure-pipeline.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ jobs:
inputs:
packageType: 'sdk'
useGlobalJson: true

# Set the Incrementalist base branch based on PR target branch
- pwsh: |
if ('$(Build.Reason)' -eq 'PullRequest') {
# Extract branch name from refs/heads/branch format
$targetBranch = '$(System.PullRequest.TargetBranch)'.Replace('refs/heads/', '')
Write-Host "PR detected - using base branch: $targetBranch"
Write-Host "##vso[task.setvariable variable=IncrementalistBaseBranch]$targetBranch"
} else {
Write-Host "Not a PR - using default base branch: dev"
Write-Host "##vso[task.setvariable variable=IncrementalistBaseBranch]dev"
}
displayName: 'Set Incrementalist base branch'

- script: dotnet tool restore
displayName: 'Restore dotnet tools'
Expand Down
8 changes: 4 additions & 4 deletions build-system/pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
name: "netfx_tests_windows"
displayName: ".NET Framework Unit Tests (Windows)"
vmImage: "windows-latest"
command: "dotnet incrementalist run --config .incrementalist/testsOnly.json -- test -c Release --no-build --framework net48 --logger:trx --results-directory TestResults"
command: "dotnet incrementalist run --config .incrementalist/testsOnly.json --branch $(IncrementalistBaseBranch) -- test -c Release --no-build --framework net48 --logger:trx --results-directory TestResults"
outputDirectory: "TestResults"
artifactName: "netfx_tests_windows-$(Build.BuildId)"

Expand All @@ -80,7 +80,7 @@ jobs:
name: "net_tests_windows"
displayName: ".NET Unit Tests (Windows)"
vmImage: "windows-latest"
command: "dotnet incrementalist run --config .incrementalist/testsOnly.json -- test -c Release --no-build --framework net8.0 --logger:trx --results-directory TestResults"
command: "dotnet incrementalist run --config .incrementalist/testsOnly.json --branch $(IncrementalistBaseBranch) -- test -c Release --no-build --framework net8.0 --logger:trx --results-directory TestResults"
outputDirectory: "TestResults"
artifactName: "net_tests_windows-$(Build.BuildId)"

Expand All @@ -89,7 +89,7 @@ jobs:
name: "net_tests_linux"
displayName: ".NET Unit Tests (Linux)"
vmImage: "ubuntu-latest"
command: "dotnet incrementalist run --config .incrementalist/testsOnly.json -- test -c Release --no-build --framework net8.0 --logger:trx --results-directory TestResults"
command: "dotnet incrementalist run --config .incrementalist/testsOnly.json --branch $(IncrementalistBaseBranch) -- test -c Release --no-build --framework net8.0 --logger:trx --results-directory TestResults"
outputDirectory: "TestResults"
artifactName: "net_tests_linux-$(Build.BuildId)"

Expand All @@ -98,7 +98,7 @@ jobs:
name: "net_mntr_windows"
displayName: ".NET Multi-Node Tests (Windows)"
vmImage: "windows-latest"
command: "dotnet incrementalist run --config .incrementalist/mutliNodeOnly.json -- test -c Release --no-build --framework net8.0 --logger:trx --results-directory TestResults/multinode"
command: "dotnet incrementalist run --config .incrementalist/mutliNodeOnly.json --branch $(IncrementalistBaseBranch) -- test -c Release --no-build --framework net8.0 --logger:trx --results-directory TestResults/multinode"
outputDirectory: "TestResults"
artifactName: "net_mntr_windows-$(Build.BuildId)"
mntrFailuresDir: 'TestResults\\multinode'
Expand Down