Fix batch generation build artifact

Author: Pan-Qi

.azure-pipelines/PipelineSteps/BatchGeneration/filter.ps1

@@ -33,7 +33,7 @@ if ($env:RUN_TEST_ON_ALL_MODULES -eq "True") {
 }
 else {
     Write-Host "Run test on generated folder changed modules"
-    # Only generated filder change should trigger the test 
+    # Only generated folder change should trigger the test
     for ($i = 0; $i -lt $ChangedFiles.Count; $i++) {
         if ($ChangedFiles[$i] -match '^generated/([^/]+)/([^/]+\.autorest)/') {
             $moduleName = $Matches[2]
@@ -63,6 +63,11 @@ foreach ($subModule in $changedSubModules) {
 Write-Host "##[endgroup]"
 Write-Host
 
+$changedModulesRecordFile = Join-Path $artifactsDir 'filteredChangedModules.txt'
+$changedModules | Set-Content -Path $changedModulesRecordFile -Encoding UTF8
+$changedSubModulesRecordFile = Join-Path $artifactsDir 'filteredChangedSubModules.txt'
+$changedSubModules | Set-Content -Path $changedSubModulesRecordFile -Encoding UTF8
+
 $groupedBuildModules = Group-Modules -Modules $changedModules -MaxParallelJobs $MaxParallelBuildJobs
 Write-Matrix -GroupedModules $groupedBuildModules -VariableName 'buildTargets' -RepoRoot $RepoRoot
 

.azure-pipelines/PipelineSteps/BatchGeneration/prepare.ps1

@@ -45,3 +45,6 @@ if ($MatrixStr -and $MatrixStr.Length -gt 1) {
     $MatrixStr = $MatrixStr.Substring(1)
 }
 Write-Host "##vso[task.setVariable variable=generationTargets;isOutput=true]{$MatrixStr}"
+
+$V4ModulesRecordFile = Join-Path $artifactsDir 'preparedV4Modules.txt'
+$modules | Set-Content -Path $V4ModulesRecordFile -Encoding UTF8

.azure-pipelines/batch-generation.yml

@@ -196,7 +196,7 @@ stages:
           targetType: inline
           pwsh: true
           script: |
-            $base = git merge-base HEAD origin/main
+            $base = git merge-base HEAD +origin/main
             $changedFiles = git diff --name-only $base HEAD
 
             $sourceBranchName = "$(Build.SourceBranch)".Replace('refs/heads/', '')