+7

SunSerega · Sep 1, 2024 · 77f8714 · 77f8714
1 parent f935eea
commit 77f8714
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml
@@ -265,10 +265,11 @@ jobs:
                         
                         if ($subm_rem_pretest_pr_nums -or $core_rem_pretest_pr_nums) {
                             $remove_list += [PSCustomObject]@{
-                                'org_repo' = $subm.repo;
-                                'fork_repo' = "SunSerega/$($subm.name)";
-                                'subm_pretest_pr_nums' = $subm_rem_pretest_pr_nums -join ',';
-                                'core_pretest_pr_nums' = $core_rem_pretest_pr_nums -join ',';
+                                '!id'                   = $subm.name;
+                                'org_repo'              = $subm.repo;
+                                'fork_repo'             = "SunSerega/$($subm.name)";
+                                'subm_pretest_pr_nums'  = $subm_rem_pretest_pr_nums -join ',';
+                                'core_pretest_pr_nums'  = $core_rem_pretest_pr_nums -join ',';
                             }
                         }
                         
@@ -356,6 +357,7 @@ jobs:
                     if (-not $?) {
                         Write-Host "git merge failed"
                         Write-Host "This PR is outdated and cannot be properly tested"
+                        Write-Output "::notice::Cannot test PR $pr_num from $subm_name, because it has conflicts"
                         exit 0
                     }