Update integration test script to use default branch variable for base branch determination

johlju · johlju · commit f1a12010a48a · 2025-08-19T18:41:21.000+02:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -108,7 +108,7 @@ stages:
                 else
                 {
                     Write-Host "Target is non-default branch ($env:BUILD.SOURCEBRANCH). Using script analysis to determine test requirements against default branch."
-                    $shouldRun = & ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch "origin/$env:BUILD.SOURCEBRANCH" -CurrentBranch 'HEAD'
+                    $shouldRun = & ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch "origin/$(defaultBranch)" -CurrentBranch 'HEAD' -UseMergeBase
                 }
 
                 # Set Azure DevOps output variable for pipeline conditions

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ stages:`
`108`	`108`	`else`
`109`	`109`	`{`
`110`	`110`	`Write-Host "Target is non-default branch ($env:BUILD.SOURCEBRANCH). Using script analysis to determine test requirements against default branch."`
`111`		`- $shouldRun = & ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch "origin/$env:BUILD.SOURCEBRANCH" -CurrentBranch 'HEAD'`
	`111`	`+ $shouldRun = & ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch "origin/$(defaultBranch)" -CurrentBranch 'HEAD' -UseMergeBase`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`# Set Azure DevOps output variable for pipeline conditions`