From fcbe4d62d66cb4a5d46ff9c5004af1a80a5f6976 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Mon, 12 Jan 2026 16:29:19 +0530 Subject: [PATCH] chore: setup release CI and mergify for version-16 (#35859) Signed-off-by: Akhil Narang --- .github/workflows/initiate_release.yml | 2 +- .mergify.yml | 49 +++++++++++++------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml index 01b4464b69..4ddfe8bf91 100644 --- a/.github/workflows/initiate_release.yml +++ b/.github/workflows/initiate_release.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["14", "15"] + version: ["14", "15", "16"] steps: - uses: octokit/request-action@v2.x diff --git a/.mergify.yml b/.mergify.yml index 66160a79e4..527d33b9ab 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,24 +2,24 @@ pull_request_rules: - name: Auto-close PRs on stable branch conditions: - and: - - and: - - author!=surajshetty3416 - - author!=deepeshgarg007 - - author!=ankush - - author!=frappe-pr-bot - - author!=mergify[bot] - - or: - - base=version-16 - - base=version-15 - - base=version-14 - - base=version-13 - - base=version-12 + - and: + - author!=surajshetty3416 + - author!=deepeshgarg007 + - author!=ankush + - author!=frappe-pr-bot + - author!=mergify[bot] + - or: + - base=version-16 + - base=version-15 + - base=version-14 + - base=version-13 + - base=version-12 actions: close: comment: - 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 + 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: @@ -31,16 +31,6 @@ pull_request_rules: assignees: - "{{ author }}" - - name: backport to version-13-hotfix - conditions: - - label="backport version-13-hotfix" - actions: - backport: - branches: - - version-13-hotfix - assignees: - - "{{ author }}" - - name: backport to version-14-hotfix conditions: - label="backport version-14-hotfix" @@ -61,3 +51,12 @@ pull_request_rules: assignees: - "{{ author }}" + - name: backport to version-16-hotfix + conditions: + - label="backport version-16-hotfix" + actions: + backport: + branches: + - version-16-hotfix + assignees: + - "{{ author }}"