Fix two CI issues (#16970)

cocos · May 11, 2024 · 0395112 · 0395112
1 parent 82dfc97
commit 0395112
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/run_test_cases.yml b/.github/workflows/run_test_cases.yml
@@ -72,6 +72,7 @@ jobs:
           git pull origin ${{ steps.parse_pr.outputs.pr_base_ref }} --allow-unrelated-histories
           git branch -D ${{ steps.parse_pr.outputs.pr_base_ref }}
           git branch ${{ steps.parse_pr.outputs.pr_base_ref }}
+          git branch -D pull-${{ steps.get_pr.outputs.pr_number }} || true
           git fetch origin pull/${{ steps.get_pr.outputs.pr_number }}/head:pull-${{ steps.get_pr.outputs.pr_number }}
           git merge --ff -s recursive --no-verify -m "PR Test" origin/${{ steps.parse_pr.outputs.pr_base_ref }} pull-${{ steps.get_pr.outputs.pr_number }}
       - name: Download external libraries

diff --git a/package-lock.json b/package-lock.json