+12

.github/workflows/upstream pretest.yaml

@@ -19,6 +19,8 @@ concurrency:
 # - Store sha on the pretest side, not subm-pretest
 # TODO don't update pretest, when only the /merge has changed
 # - Merge the /merge commit, but test the /head commit
+# - No, actually, better way would be to always first try pull /head and merge main into it, and then merge that into the current state of pretest branch
+# - That way I can always first check for upstream conflicts
 
 
 
@@ -197,13 +199,13 @@ jobs:
                                     param ($ref, $key)
                                     $pattern = "^meta\.$key=([0-9a-f]{40})$"
                                     
-                                    Write-Host "--- Looking for commit message lines matching [$pattern]"
+                                    # Write-Host "--- Looking for commit message lines matching [$pattern]"
                                     $res = @()
                                     foreach ($l in git log -1 --pretty=format:"%B" $ref) {
-                                        Write-Host "----- $l"
+                                        # Write-Host "----- $l"
                                         if ($l -notmatch $pattern) { continue }
                                         $sha = $matches[1]
-                                        Write-Host "------- FOUND: $sha"
+                                        # Write-Host "------- FOUND: $sha"
                                         $res += $sha
                                     }
                                     if (-not $?) { throw "git log failed" }
@@ -513,7 +515,7 @@ jobs:
                         if (-not $?) { throw "git show failed" }
                         if ($is_trivial) {
                             Write-Host "Is trivial, removing..."
-                            # git push origin --delete $branch_name                                               # BRANCH DELETE
+                            git push origin --delete $branch_name                                               # BRANCH DELETE
                             if (-not $?) { throw "git push --delete failed" }
                             $core_removed_pr_nums += $pr_num
                         }
@@ -537,7 +539,7 @@ jobs:
                             Write-Host "But main repo is still referencing it"
                         } else {
                             Write-Host "Removing..."
-                            # git push origin --delete "pretest/$pr_num"                                          # BRANCH DELETE
+                            git push origin --delete "pretest/$pr_num"                                          # BRANCH DELETE
                             if (-not $?) { throw "git push --delete failed" }
                         }
                         Write-Host '~~~~~'