+91

SunSerega · Aug 18, 2024 · fd96770 · fd96770
1 parent 1f00db2
commit fd96770
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml
@@ -184,9 +184,13 @@ jobs:
                     git config --add remote.0_official.fetch '+refs/pull/*:refs/remotes/0_official/pull/*'
                     git fetch --all
                     
+                    Write-Host '~~~~~~~~~~~~~~~~~~~~~~~~~'
+                    git branch -a
+                    Write-Host '~~~~~~~~~~~~~~~~~~~~~~~~~'
+                    
                     $fork_main_branch_name = 'custom'
                     $fork_branch_name = "pretest/$pr_num"
-                    if (&{ git show-ref --verify -q 'refs/remotes/origin/$fork_branch_name'; $? }) {
+                    if (&{ git show-ref --verify -q 'remotes/origin/$fork_branch_name'; $? }) {
                         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
@@ -215,7 +219,7 @@ jobs:
                     # $core_main_branch_name = '${{ github.head_ref || github.ref_name }}'
                     $core_main_branch_name = '${{ github.event.repository.default_branch }}'
                     $core_branch_name = "subm-pretest/$org_repo/$pr_num"
-                    if (&{ git show-ref --verify -q 'refs/remotes/origin/$core_branch_name'; $? }) {
+                    if (&{ git show-ref --verify -q 'remotes/origin/$core_branch_name'; $? }) {
                         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"