diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 7e8a0a23189..e990228185e 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -2,7 +2,7 @@ name: 'Lock threads' on: schedule: - - cron: '*/5 * * * *' + - cron: '0 0 * * *' workflow_dispatch: permissions: diff --git a/.mergify.yml b/.mergify.yml index ac3e52666e9..1ed5e32bbed 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -23,33 +23,33 @@ pull_request_rules: 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. https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch - # - name: backport to develop - # conditions: - # - label="backport develop" - # actions: - # backport: - # branches: - # - develop - # assignees: - # - "{{ author }}" - # - name: backport to version-14-hotfix - # conditions: - # - label="backport version-14-hotfix" - # actions: - # backport: - # branches: - # - version-14-hotfix - # assignees: - # - "{{ author }}" - # - name: backport to version-15-hotfix - # conditions: - # - label="backport version-15-hotfix" - # actions: - # backport: - # branches: - # - version-15-hotfix - # assignees: - # - "{{ author }}" + - name: backport to develop + conditions: + - label="backport develop" + actions: + backport: + branches: + - develop + assignees: + - "{{ author }}" + - name: backport to version-14-hotfix + conditions: + - label="backport version-14-hotfix" + actions: + backport: + branches: + - version-14-hotfix + assignees: + - "{{ author }}" + - name: backport to version-15-hotfix + conditions: + - label="backport version-15-hotfix" + actions: + backport: + branches: + - version-15-hotfix + assignees: + - "{{ author }}" - name: Automatic merge on CI success and review conditions: - status-success=linters