+7

SunSerega · Aug 31, 2024 · a21dfd2 · a21dfd2
1 parent a847edd
commit a21dfd2
Showing 1 changed file with 21 additions and 38 deletions.
diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml
@@ -291,7 +291,7 @@ jobs:
                 uses: actions/checkout@main
                 with:
                     ref: ${{ github.event.repository.default_branch }}
-                    path: './POCGL'
+                    path: './core'
                     fetch-depth: 0
 
             -   name: checkout subm fork
@@ -395,7 +395,7 @@ jobs:
                     
                     
                     Write-Host "Updating main repo..."
-                    Push-Location './POCGL'
+                    Push-Location './core'
                     git fetch --all 2>&1 | Out-Null
                     
                     $core_main_branch_name = '${{ github.event.repository.default_branch }}'
@@ -453,13 +453,21 @@ jobs:
                     git config --global user.email "sunserega2@gmail.com"
                     git config --global --add url.https://github.com/.insteadOf "git@github.com:"
             
+            -   name: checkout main repo
+                uses: actions/checkout@main
+                with:
+                    path: './core'
+                    sparse-checkout-cone-mode: false
+                    sparse-checkout: '<NOTHING>'
+
             -   name: checkout subm fork
                 uses: actions/checkout@main
                 with:
-                    repository: ${{ matrix.remove-data.fork_repo }}
-                    token: ${{ secrets.POCGL_pretest_upstream_PAT }}
+                    path: './fork'
                     sparse-checkout-cone-mode: false
                     sparse-checkout: '<NOTHING>'
+                    repository: ${{ matrix.remove-data.fork_repo }}
+                    token: ${{ secrets.POCGL_pretest_upstream_PAT }}
 
             -   name: (!) remove old pretest branches
                 run: |
@@ -477,36 +485,7 @@ jobs:
                     
                     
                     
-                    # Write-Host "=============================="
-                    # git config -l
-                    # if (-not $?) { throw "git config -l failed" }
-                    # Write-Host "=============================="
-                    
-                    $main_repo_dir = './core'
-                    New-Item -ItemType Directory -Path $main_repo_dir | Out-Null
-                    Push-Location $main_repo_dir
-                    $main_repo_url = '${{ github.server_url }}/${{ github.repository }}'
-                    Write-Host "Cloning main repo [$main_repo_url]"
-                    
-                    git clone --filter=tree:0 --no-progress --no-checkout $main_repo_url .
-                    if (-not $?) { throw "git clone failed" }
-                    
-                    # git init
-                    # if (-not $?) { throw "git init failed" }
-                    # git config --local http.https://github.com/.extraheader "AUTHORIZATION: basic ${{ github.token }}"
-                    # if (-not $?) { throw "git config failed" }
-                    
-                    # Write-Host "=============================="
-                    # git config -l
-                    # if (-not $?) { throw "git config -l failed" }
-                    # Write-Host "=============================="
-                    
-                    # git remote add origin $main_repo_url
-                    # if (-not $?) { throw "git remote add failed" }
-                    # git -c protocol.version=2 fetch --no-tags --prune --depth=1 origin --filter=tree:0 --no-progress
-                    # if (-not $?) { throw "git fetch failed" }
-                    
-                    # git branch -r
+                    Push-Location './core'
                     
                     $core_removed_pr_nums = @()
                     foreach ($pr_num in $core_pretest_pr_nums) {
@@ -524,27 +503,29 @@ 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
                         }
                         Write-Host '~~~~~'
                     }
                     
-                    Pop-Location
-                    
                     $core_pretest_pr_nums = $core_pretest_pr_nums |
                         Where-Object { $_ -notin $core_removed_pr_nums }
                     
+                    Pop-Location
+                    
+                    
                     
+                    Push-Location './fork'
                     
                     foreach ($pr_num in $subm_pretest_pr_nums) {
                         Write-Host "PR $pr_num was closed"
                         if ($core_pretest_pr_nums -contains $pr_num) {
                             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 '~~~~~'
@@ -557,4 +538,6 @@ jobs:
                         }
                         throw "Some pretest branches in main repo are dangling"
                     }
+                    
+                    Pop-Location