-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
2 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -182,7 +182,7 @@ jobs: | |
Push-Location './fork' | ||
git remote add 0_official "[email protected]:${org_repo}.git" | ||
git config --add remote.0_official.fetch '+refs/pull/*:refs/remotes/0_official/pull/*' | ||
git fetch -v --all | ||
git fetch --all | ||
$fork_main_branch_name = 'custom' | ||
$fork_branch_name = "pretest/$pr_num" | ||
|
@@ -198,8 +198,6 @@ jobs: | |
git push --set-upstream origin $fork_branch_name | ||
} | ||
git branch -a | ||
Write-Host "Merging latest commits from PR $pr_num" | ||
git merge "remotes/0_official/pull/$pr_num/head" | ||
if (-not $?) { throw "git merge failed" } | ||
|
@@ -212,7 +210,7 @@ jobs: | |
Write-Host "Updating main repo..." | ||
Push-Location './POCGL' | ||
git fetch | ||
git fetch --all | ||
# $core_main_branch_name = '${{ github.head_ref || github.ref_name }}' | ||
$core_main_branch_name = '${{ github.event.repository.default_branch }}' | ||
|