Skip to content

Commit

Permalink
+90
Browse files Browse the repository at this point in the history
  • Loading branch information
SunSerega committed Aug 18, 2024
1 parent 29d3e78 commit 1f00db2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/upstream pretest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" }
Expand All @@ -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 }}'
Expand Down

0 comments on commit 1f00db2

Please sign in to comment.