fix conflict

Signed-off-by: AndyZiYe <[email protected]>
StarRocks · Apr 2, 2024 · 24d1350 · 24d1350
1 parent 5510c8d
commit 24d1350
Show file tree

Hide file tree

Showing 2 changed files with 258 additions and 228 deletions.
diff --git a/.github/workflows/ci-pipeline-branch.yml b/.github/workflows/ci-pipeline-branch.yml
@@ -220,13 +220,8 @@ jobs:
 
   be-ut:
     runs-on: [self-hosted, normal]
-<<<<<<< HEAD
-    needs: [ be-checker, thirdparty-update ]
-    timeout-minutes: 90
-=======
     needs: [ be-checker, thirdparty-info ]
     timeout-minutes: 180
->>>>>>> 5fbfe09700 ([Tool] Branch pipeline support ubuntu image update (#43499))
     name: BE UT
     env:
       PR_NUMBER: ${{ github.event.number }}
@@ -277,11 +272,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: basic-checker
     name: FE FILTER
-<<<<<<< HEAD
-    if: needs.sync-checker.outputs.PASS == 'true' || needs.sync-checker.outputs.THIRDPARTY == 'true'
-=======
     if: needs.basic-checker.outputs.PASS == 'true'
->>>>>>> 5fbfe09700 ([Tool] Branch pipeline support ubuntu image update (#43499))
     outputs:
       output1: ${{ steps.fe-changes-info.outputs.fe }}
     steps:
@@ -491,8 +482,6 @@ jobs:
           rm -f ${{ steps.run_ut.outputs.RES_LOG }}
           rm -rf ${{ steps.run_ut.outputs.COV_DIR }}
           rm -rf ${{ github.workspace }}/*
-<<<<<<< HEAD
-=======
 
   Teardown:
     runs-on: [self-hosted, normal]
@@ -528,4 +517,3 @@ jobs:
       - name: Clean
         run: |
           rm -rf ${{ github.workspace }}/*
->>>>>>> 5fbfe09700 ([Tool] Branch pipeline support ubuntu image update (#43499))