From 2de6e2d0cc5c5e21e4a978f823bf3d0b720d6888 Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Sat, 6 Jul 2024 17:45:17 +0800 Subject: [PATCH] chore(CI): sync changes from next branch (#4832) --- .github/workflows/e2e.yml | 41 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1c86f93518..70cce1c134 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -8,6 +8,7 @@ on: push: branches: - 'main' + - 'develop' - 'next' paths: - '.github/workflows/e2e.yml' @@ -36,7 +37,14 @@ jobs: ref: main path: packages/pro-plugins ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} - + - name: Fetch all branches + run: cd packages/pro-plugins && git fetch --all + - name: git checkout ${{ github.event.pull_request.base.ref }} + run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }} + continue-on-error: true + - name: git checkout ${{ github.head_ref || github.ref_name }} + run: cd packages/pro-plugins && git checkout${{ github.head_ref || github.ref_name }} + continue-on-error: true - name: Use Node.js uses: actions/setup-node@v4 with: @@ -88,8 +96,11 @@ jobs: ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} - name: Fetch all branches run: cd packages/pro-plugins && git fetch --all - - name: git checkout ${{ github.head_ref }} - run: cd packages/pro-plugins && git checkout ${{ github.head_ref }} + - name: git checkout ${{ github.event.pull_request.base.ref }} + run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }} + continue-on-error: true + - name: git checkout ${{ github.head_ref || github.ref_name }} + run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }} continue-on-error: true - name: Set variables continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错,为了能够继续执行后续步骤,所以这里设置为 continue-on-error: true @@ -171,6 +182,14 @@ jobs: ref: main path: packages/pro-plugins ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + - name: Fetch all branches + run: cd packages/pro-plugins && git fetch --all + - name: git checkout ${{ github.event.pull_request.base.ref }} + run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }} + continue-on-error: true + - name: git checkout ${{ github.head_ref || github.ref_name }} + run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }} + continue-on-error: true - name: Set variables continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错,为了能够继续执行后续步骤,所以这里设置为 continue-on-error: true run: | @@ -251,6 +270,14 @@ jobs: ref: main path: packages/pro-plugins ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + - name: Fetch all branches + run: cd packages/pro-plugins && git fetch --all + - name: git checkout ${{ github.event.pull_request.base.ref }} + run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }} + continue-on-error: true + - name: git checkout ${{ github.head_ref || github.ref_name }} + run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }} + continue-on-error: true - name: Set variables continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错,为了能够继续执行后续步骤,所以这里设置为 continue-on-error: true run: | @@ -331,6 +358,14 @@ jobs: ref: main path: packages/pro-plugins ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + - name: Fetch all branches + run: cd packages/pro-plugins && git fetch --all + - name: git checkout ${{ github.event.pull_request.base.ref }} + run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }} + continue-on-error: true + - name: git checkout ${{ github.head_ref || github.ref_name }} + run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }} + continue-on-error: true - name: Set variables continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错,为了能够继续执行后续步骤,所以这里设置为 continue-on-error: true run: |