ci: Revert fail on merge conflict label

This reverts commit d32f229483.
This commit is contained in:
Ankush Menat
2022-03-14 14:43:15 +05:30
parent 98a67967a3
commit 468964a3f7
2 changed files with 0 additions and 13 deletions

View File

@@ -5,7 +5,6 @@ on:
paths-ignore:
- '**.js'
- '**.md'
types: [opened, unlabeled, synchronize, reopened]
workflow_dispatch:
@@ -30,11 +29,6 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps:
- name: Check for merge conficts label
if: ${{ contains(github.event.pull_request.labels.*.name, 'conflicts') }}
run: |
echo "Remove merge conflicts and remove conflict label to run CI"
exit 1
- name: Clone
uses: actions/checkout@v2