Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
+26
Browse files Browse the repository at this point in the history
SunSerega committed Aug 31, 2024
1 parent 3635517 commit d16b163
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/upstream pretest.yaml
Original file line number Diff line number Diff line change
@@ -374,8 +374,12 @@ jobs:
Write-Host "- Branch for PR $pr_num exists"
git checkout $b_fork_pretest
Write-Host "--- Merging with ${b_fork_merged_pr_head}:"
git merge $b_fork_merged_pr_head
Write-Host "--- Merging with PR head:"
git merge "remotes/$remote_official/pull/$pr_num/head"
if (-not $?) { throw "git merge failed" }
Write-Host "--- Merging with ${b_fork_upstream_main}:"
git merge $b_fork_upstream_main
if (-not $?) { throw "git merge failed" }
Write-Host "--- Merging with ${b_fork_main}:"
@@ -614,7 +618,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
}
@@ -638,7 +642,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 '~~~~~'

0 comments on commit d16b163

Please sign in to comment.