fix

liushilongbuaa · Nov 1, 2022 · e17474e · e17474e
1 parent 635dec6
commit e17474e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/automerge_scan.yml b/.github/workflows/automerge_scan.yml
@@ -26,6 +26,7 @@ jobs:
         do
           url=$(cat prs.log | jq -r ".[$i].url")
           echo PR: $(($i+1))/$count, URL: $url
+          [[ "$url" == "" ]] && continue
           checks=$(cat prs.log | jq ".[$i].statusCheckRollup")
           checks_count=$(echo $checks | jq 'length')
           echo Checks count: $checks_count
@@ -52,6 +53,6 @@ jobs:
           done
           # merge the PR
           echo ========Merging  PR========
-          gh pr merge --squash --admin -R sonic-net/sonic-buildimage $url || true
+          gh pr merge --rebase --admin -R sonic-net/sonic-buildimage $url || true
           echo ========Finished PR========
         done