From d9cbab035593a5582fae7f670a08b65d5cdfff43 Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Sat, 28 Aug 2021 22:24:15 +0800 Subject: [PATCH] ci: fixing conflict (#97) --- .github/workflows/add-labels.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/workflows/add-labels.yml b/.github/workflows/add-labels.yml index 8674cf849..4c8d5e33c 100644 --- a/.github/workflows/add-labels.yml +++ b/.github/workflows/add-labels.yml @@ -10,33 +10,7 @@ jobs: add_labels: runs-on: ubuntu-latest steps: -<<<<<<< HEAD - uses: logto-io/actions-add-labels-run-steps@v1.0.1 -======= - - uses: actions/checkout@v2 - - - name: Extract Label - id: extract-label - run: | - echo "::set-output name=labels_to_add::$( - node -e " - const title = process.env.TITLE; - const labelMapping = { - chore: 'chore', - feat: 'feature', - fix: 'bugfix', - refactor: 'enhancement', - test: 'testing', - }; - const foundKey = Object.keys(labelMapping).find((label) => title && title.startsWith(label)); - console.log(foundKey ? labelMapping[foundKey] : ''); - " - )" - env: - TITLE: ${{ github.event.pull_request.title || github.event.issue.title }} - - - uses: actions-ecosystem/action-add-labels@v1.1.0 ->>>>>>> 5dc8d4c (test(core): add unit tests for database utils) with: title: ${{ github.event.pull_request.title || github.event.issue.title }} github-token: ${{ github.token }}