Skip to content

Commit 98690c4

Browse files
authored
Merge pull request #46412 from ruthra-kumar/revert_mergify_and_lock_thread_changes
ci: re-enable label backports and decrease lock frequency
2 parents 0afcf59 + 97733c8 commit 98690c4

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

.github/workflows/lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Lock threads'
22

33
on:
44
schedule:
5-
- cron: '*/5 * * * *'
5+
- cron: '0 0 * * *'
66
workflow_dispatch:
77

88
permissions:

.mergify.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,33 @@ pull_request_rules:
2323
message: |
2424
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
2525
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
26-
# - name: backport to develop
27-
# conditions:
28-
# - label="backport develop"
29-
# actions:
30-
# backport:
31-
# branches:
32-
# - develop
33-
# assignees:
34-
# - "{{ author }}"
35-
# - name: backport to version-14-hotfix
36-
# conditions:
37-
# - label="backport version-14-hotfix"
38-
# actions:
39-
# backport:
40-
# branches:
41-
# - version-14-hotfix
42-
# assignees:
43-
# - "{{ author }}"
44-
# - name: backport to version-15-hotfix
45-
# conditions:
46-
# - label="backport version-15-hotfix"
47-
# actions:
48-
# backport:
49-
# branches:
50-
# - version-15-hotfix
51-
# assignees:
52-
# - "{{ author }}"
26+
- name: backport to develop
27+
conditions:
28+
- label="backport develop"
29+
actions:
30+
backport:
31+
branches:
32+
- develop
33+
assignees:
34+
- "{{ author }}"
35+
- name: backport to version-14-hotfix
36+
conditions:
37+
- label="backport version-14-hotfix"
38+
actions:
39+
backport:
40+
branches:
41+
- version-14-hotfix
42+
assignees:
43+
- "{{ author }}"
44+
- name: backport to version-15-hotfix
45+
conditions:
46+
- label="backport version-15-hotfix"
47+
actions:
48+
backport:
49+
branches:
50+
- version-15-hotfix
51+
assignees:
52+
- "{{ author }}"
5353
- name: Automatic merge on CI success and review
5454
conditions:
5555
- status-success=linters

0 commit comments

Comments
 (0)