From 44d1b435de2472a6e4ec11cab91cc8f17b86bf79 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 13 Apr 2022 16:54:47 +0800 Subject: [PATCH] ci: pr add label --- .github/workflows/auto-pr.yml | 6 +++++- .github/workflows/pr-branch.yml | 16 ---------------- backend/src/main/java/io/metersphere/xpack | 2 +- frontend/src/business/components/xpack | 2 +- 4 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/pr-branch.yml diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 289f74d0bc..eedf4887e9 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,4 +10,8 @@ jobs: - name: Add labels uses: jumpserver/action-generic-handler@master env: - GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }} + - uses: actions/checkout@v2 + - uses: actions-ecosystem/action-add-labels@v1 + with: + labels: ${{ github.base_ref }} \ No newline at end of file diff --git a/.github/workflows/pr-branch.yml b/.github/workflows/pr-branch.yml deleted file mode 100644 index ca15464cd2..0000000000 --- a/.github/workflows/pr-branch.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Add Label - -on: [ pull_request ] - -env: - BASE_BRANCH: ${{ github.base_ref }} - -jobs: - add_label: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-ecosystem/action-add-labels@v1 - if: ${{ startsWith(github.event.comment.body, '/add-labels') }} - with: - labels: env.BASE_BRANCH \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index f34e53df89..9f4fd7c34e 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit f34e53df8998e829d66517080ef79432f48783e5 +Subproject commit 9f4fd7c34e497d1df2f4b0add4d9dcb47a015df1 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 8be1971091..585823e408 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 8be19710915228b7019551cbba4ea391effb53fb +Subproject commit 585823e408618bd7e0b6e173c4df714ca7682461