+84

.github/workflows/upstream pretest.yaml

@@ -180,6 +180,7 @@ jobs:
                     
                     Write-Host "Updating subm fork..."
                     Push-Location './fork'
+                    git remote add 0_official "[email protected]:${org_repo}.git"
                     git fetch
                     
                     $fork_main_branch_name = 'custom'
@@ -188,6 +189,7 @@ jobs:
                         Write-Host "Branch for PR $pr_num exists. Merging with ${fork_main_branch_name}:"
                         git checkout $fork_branch_name
                         git merge $fork_main_branch_name
+                        if (-not $?) { throw "git merge failed" }
                         git push
                     } else {
                         Write-Host "Branch for PR $pr_num doesn't exist. Creating:"
@@ -197,7 +199,9 @@ jobs:
                     
                     Write-Host "Merging latest commits from PR $pr_num"
                     git merge "refs/pull/$pr_num/merge"
+                    if (-not $?) { throw "git merge failed" }
                     git push
+                    if (-not $?) { throw "git push failed" }
                     
                     Pop-Location
                     
@@ -214,12 +218,14 @@ jobs:
                         Write-Host "Branch for PR $pr_num exists. Merging with ${core_main_branch_name}:"
                         git checkout $core_branch_name
                         git merge $core_main_branch_name -m "[auto pretest] Merge $core_branch_name into subm-pretest/... branch"
+                        if (-not $?) { throw "git merge failed" }
                         git push
                     } else {
                         Write-Host "Branch for PR $pr_num doesn't exist. Creating:"
                         git branch $core_branch_name
                         git push --set-upstream origin $core_branch_name
                     }
+                    git push -f # TODO REMOVE!!!!!
                     
                     & .\DeleteAllTemp.bat NoPause | Out-Null
                     
@@ -232,6 +238,7 @@ jobs:
                     git add -A
                     git commit -m "[auto pretest] test changes"
                     git push
+                    if (-not $?) { throw "git push failed" }
                     
                     Pop-Location