From 9821be2b68f990db73bb627abfc288ee461330da Mon Sep 17 00:00:00 2001 From: PP Date: Thu, 9 Dec 2021 16:16:12 +0800 Subject: [PATCH] fix the same name of branches for interface check (#9789) * fix the same name of branches for interface check * update * fix rebase --- .github/workflows/interface-check.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/interface-check.yml b/.github/workflows/interface-check.yml index 11318e2adb..59981d925a 100644 --- a/.github/workflows/interface-check.yml +++ b/.github/workflows/interface-check.yml @@ -17,7 +17,7 @@ jobs: working-directory: ./engine run: | git fetch origin ${{ github.base_ref }} - git checkout -b ${{ github.base_ref }} remotes/origin/${{ github.base_ref }} + git checkout -b ${{ github.base_ref }}_BASE remotes/origin/${{ github.base_ref }} git branch - name: npm install BASE branch @@ -44,12 +44,13 @@ jobs: run: | git remote add HEAD_REPO https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git git fetch HEAD_REPO ${{ github.head_ref }} - git checkout -b ${{ github.head_ref }} remotes/HEAD_REPO/${{ github.head_ref }} + git checkout -b ${{ github.head_ref }}_HEAD remotes/HEAD_REPO/${{ github.head_ref }} git branch - name: rebase BASE branch working-directory: ./engine run: | + git checkout . git pull --rebase origin ${{ github.base_ref }} - name: npm install HEAD branch