mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-04 12:49:10 +00:00
Merge pull request #46412 from ruthra-kumar/revert_mergify_and_lock_thread_changes
ci: re-enable label backports and decrease lock frequency
This commit is contained in:
2
.github/workflows/lock.yml
vendored
2
.github/workflows/lock.yml
vendored
@@ -2,7 +2,7 @@ name: 'Lock threads'
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '*/5 * * * *'
|
- cron: '0 0 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
|
|||||||
54
.mergify.yml
54
.mergify.yml
@@ -23,33 +23,33 @@ pull_request_rules:
|
|||||||
message: |
|
message: |
|
||||||
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
|
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
|
||||||
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
|
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
|
||||||
# - name: backport to develop
|
- name: backport to develop
|
||||||
# conditions:
|
conditions:
|
||||||
# - label="backport develop"
|
- label="backport develop"
|
||||||
# actions:
|
actions:
|
||||||
# backport:
|
backport:
|
||||||
# branches:
|
branches:
|
||||||
# - develop
|
- develop
|
||||||
# assignees:
|
assignees:
|
||||||
# - "{{ author }}"
|
- "{{ author }}"
|
||||||
# - name: backport to version-14-hotfix
|
- name: backport to version-14-hotfix
|
||||||
# conditions:
|
conditions:
|
||||||
# - label="backport version-14-hotfix"
|
- label="backport version-14-hotfix"
|
||||||
# actions:
|
actions:
|
||||||
# backport:
|
backport:
|
||||||
# branches:
|
branches:
|
||||||
# - version-14-hotfix
|
- version-14-hotfix
|
||||||
# assignees:
|
assignees:
|
||||||
# - "{{ author }}"
|
- "{{ author }}"
|
||||||
# - name: backport to version-15-hotfix
|
- name: backport to version-15-hotfix
|
||||||
# conditions:
|
conditions:
|
||||||
# - label="backport version-15-hotfix"
|
- label="backport version-15-hotfix"
|
||||||
# actions:
|
actions:
|
||||||
# backport:
|
backport:
|
||||||
# branches:
|
branches:
|
||||||
# - version-15-hotfix
|
- version-15-hotfix
|
||||||
# assignees:
|
assignees:
|
||||||
# - "{{ author }}"
|
- "{{ author }}"
|
||||||
- name: Automatic merge on CI success and review
|
- name: Automatic merge on CI success and review
|
||||||
conditions:
|
conditions:
|
||||||
- status-success=linters
|
- status-success=linters
|
||||||
|
|||||||
Reference in New Issue
Block a user