+81

.github/workflows/upstream pretest.yaml

@@ -204,17 +204,10 @@ jobs:
                     
                     Write-Host "Updating main repo..."
                     Push-Location './core'
-                    git fetch --all
-                    
-                    Write-Host '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
-                    git show-ref
-                    Write-Host '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
-                    git branch -r
-                    Write-Host '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
+                    git fetch
                     
                     # $core_main_branch_name = '${{ github.head_ref || github.ref_name }}'
-                    $core_main_branch_name = git symbolic-ref refs/remotes/origin/HEAD --short
-                    if (-not $?) { throw "git symbolic-ref failed" }
+                    $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'; $? }) {
                         Write-Host "Branch for PR $pr_num exists. Merging with ${core_main_branch_name}:"
@@ -288,8 +281,7 @@ jobs:
                     Push-Location $main_repo_dir
                     $main_repo_url = '${{ github.server_url }}/${{ github.repository }}'
                     # $main_repo_branch = '${{ github.head_ref || github.ref_name }}'
-                    $main_repo_branch = git symbolic-ref refs/remotes/origin/HEAD --short
-                    if (-not $?) { throw "git symbolic-ref failed" }
+                    $main_repo_branch = '${{ github.event.repository.default_branch }}'
                     Write-Host "Cloning main repo [$main_repo_url]: branch [$main_repo_branch]"
                     git clone -b $main_repo_branch --filter=tree:0 --no-progress --no-checkout $main_repo_url .
                     if (-not $?) { throw "git clone failed" }