From f37c76d23bf376fcef7e1d94d134b23aa54c9e19 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sun, 18 Aug 2024 18:45:44 +0200 Subject: [PATCH] +57 --- .github/workflows/upstream pretest.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml index 963a6182..708f8a4e 100644 --- a/.github/workflows/upstream pretest.yaml +++ b/.github/workflows/upstream pretest.yaml @@ -99,7 +99,8 @@ jobs: if ($subm_pretest_pr_nums -or $core_pretest_pr_nums) { $remove_list += @{ - 'repo' = "SunSerega/$subm_name"; + 'org_repo' = "$subm_owner/$subm_name"; + 'fork_repo' = "SunSerega/$subm_name"; 'subm_pretest_pr_nums' = $subm_pretest_pr_nums -join ','; 'core_pretest_pr_nums' = $core_pretest_pr_nums -join ','; } @@ -173,7 +174,7 @@ jobs: - name: checkout subm fork uses: actions/checkout@main with: - repository: ${{ matrix.remove-data.repo }} + repository: ${{ matrix.remove-data.fork_repo }} token: ${{ secrets.POCGL_pretest_upstream_PAT }} sparse-checkout-cone-mode: false sparse-checkout: '' @@ -187,7 +188,8 @@ jobs: return $s -split ',' } - $repo = '${{ matrix.remove-data.repo }}' + $org_repo = '${{ matrix.remove-data.org_repo }}' + $fork_repo = '${{ matrix.remove-data.fork_repo }}' $subm_pretest_pr_nums = Split-OrEmpty '${{ matrix.remove-data.subm_pretest_pr_nums }}' $core_pretest_pr_nums = Split-OrEmpty '${{ matrix.remove-data.core_pretest_pr_nums }}' @@ -199,11 +201,12 @@ jobs: $main_repo_url = '${{ github.server_url }}/${{ github.repository }}' Write-Host "fetching commits of: $main_repo_url" git clone --filter=tree:0 $main_repo_url + git branch -r $core_removed_pr_nums = @() foreach ($pr_num in $core_pretest_pr_nums) { Write-Host "Checking if subm-pretest branch for PR $pr_num is trivial" - $branch_name = "subm-pretest/$repo/$pr_num" + $branch_name = "subm-pretest/$org_repo/$pr_num" Write-Host $branch_name $is_trivial = $true foreach ($commit_name in git show --pretty=format:"%s" -s "HEAD..origin/$branch_name") {