+8

.github/workflows/upstream pretest.yaml

@@ -382,11 +382,12 @@ jobs:
                     if (-not $?) { throw "git push failed" }
                     
                     $fork_pretest_sha = git rev-parse HEAD
+                    $empty_pretest_message = @"
+                    Update pretest meta
+                    meta.pr_merge_sha=$pr_merge_sha
+                    "@
                     if ($fork_pretest_sha -eq $fork_pretest_old_sha) {
-                        git commit -a --allow-empty -m @"
-                        Update pretest meta
-                        meta.pr_merge_sha=$pr_merge_sha
-                        "@
+                        git commit -a --allow-empty -m $empty_pretest_message
                         $fork_pretest_sha = git rev-parse HEAD
                     }
                     
@@ -457,6 +458,7 @@ jobs:
                 uses: actions/checkout@main
                 with:
                     path: './core'
+                    fetch-depth: 0
                     sparse-checkout-cone-mode: false
                     sparse-checkout: '<NOTHING>'
 
@@ -510,11 +512,13 @@ jobs:
                         Write-Host '~~~~~'
                     }
                     
+                    Pop-Location
+                    
+                    
+                    
                     $core_pretest_pr_nums = $core_pretest_pr_nums |
                         Where-Object { $_ -notin $core_removed_pr_nums }
                     
-                    Pop-Location
-                    
                     
                     
                     Push-Location './fork'
@@ -531,13 +535,15 @@ jobs:
                         Write-Host '~~~~~'
                     }
                     
+                    Pop-Location
+                    
+                    
+                    
                     if ($core_pretest_pr_nums) {
                         Write-Host "pretest branches for these PRs are dangling:"
                         foreach ($pr_num in $core_pretest_pr_nums) {
                             Write-Host "- $pr_num"
                         }
                         throw "Some pretest branches in main repo are dangling"
                     }
-                    
-                    Pop-Location