nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fail on merge conflict label

Browse Source
This commit is contained in:
Ankush Menat
2022-01-20 15:16:48 +05:30
committed by Ankush Menat
parent 8a9a13cb96
commit d32f229483
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/patch.yml vendored
View File

@@ -5,6 +5,7 @@ on:
paths-ignore: paths-ignore:
- '**.js' - '**.js'
- '**.md' - '**.md'
types: [opened, unlabeled, synchronize, reopened]
workflow_dispatch: workflow_dispatch:
@@ -29,6 +30,11 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps: 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 - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v2

7
.github/workflows/server-tests.yml vendored
View File

@@ -5,6 +5,7 @@ on:
paths-ignore: paths-ignore:
- '**.js' - '**.js'
- '**.md' - '**.md'
types: [opened, unlabeled, synchronize, reopened]
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ develop ] branches: [ develop ]
@@ -39,6 +40,12 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps: 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 - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v2