From 67f85e85d0d397b7a8f7c0f470dce6801af12ed9 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Thu, 23 Jul 2026 18:11:47 +0530
Subject: [PATCH] ci: fix merge-queue trigger gaps and run CI on develop + main
 (#278)

* ci: fix merge-queue trigger gaps and add develop to CI branches

Default branch moved to develop; keep CI running on both develop and main.
Also close two merge-queue trigger mismatches surfaced during a workflow
trigger audit.

- ci/typecheck/unit-tests/ui-tests: add `develop` to push branches so
  post-merge runs happen on both develop and main.
- pr-tittle-check: add a `merge_group` trigger and guard the validate step
  with `if: github.event_name != 'merge_group'`. As a required check it was
  never reporting on the queue commit, leaving the merge queue stuck
  "waiting for status to be reported"; it now reports success without
  re-validating (the title can't change in the queue).
- linter (Frappe Linter): drop `if: github.event_name == 'pull_request'` so
  lint is enforced in the merge queue instead of being skipped (a skipped
  required check counts as green).
- linter (Vulnerable Dependency Check): restrict to pull_request plus a new
  weekly schedule, and keep it off merge_group/push so a freshly published
  CVE in the external advisory DB can't block a queued merge.
- ci: rename concurrency prefix main-buzz -> ci-buzz now that main is not the
  default branch (no functional effect).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013EYfuce7SdhQDyZNCRMaNa

* ci: trim verbose workflow comments

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013EYfuce7SdhQDyZNCRMaNa

---------

Co-authored-by: Claude <noreply@anthropic.com>
(cherry picked from commit 2e16e496e3c13c37e752f4d6ff466dc7dfb28f52)
---
 .github/workflows/ci.yml              | 3 ++-
 .github/workflows/linter.yml          | 7 ++++++-
 .github/workflows/pr-tittle-check.yml | 3 +++
 .github/workflows/typecheck.yml       | 1 +
 .github/workflows/ui-tests.yml        | 1 +
 .github/workflows/unit-tests.yml      | 1 +
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a6c35d1..b0485e32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,12 +3,13 @@ name: CI
 on:
   push:
     branches:
+      - develop
       - main
   pull_request:
   merge_group:
 
 concurrency:
-  group: main-buzz-${{ github.event.number || github.sha }}
+  group: ci-buzz-${{ github.event.number || github.sha }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index b3731d0f..c3423957 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -3,10 +3,13 @@ name: Linters
 on:
   push:
     branches:
+      - develop
       - main
   pull_request:
   merge_group:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 1'
 
 permissions:
   contents: read
@@ -19,7 +22,7 @@ jobs:
   linter:
     name: 'Frappe Linter'
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
+    if: github.event_name != 'schedule'
 
     steps:
       - uses: actions/checkout@v4
@@ -40,6 +43,8 @@ jobs:
   deps-vulnerable-check:
     name: 'Vulnerable Dependency Check'
     runs-on: ubuntu-latest
+    # Off merge_group/push so a newly published CVE can't block a queued merge.
+    if: github.event_name == 'pull_request' || github.event_name == 'schedule'
 
     steps:
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/pr-tittle-check.yml b/.github/workflows/pr-tittle-check.yml
index c0648fb1..02dfc3bd 100644
--- a/.github/workflows/pr-tittle-check.yml
+++ b/.github/workflows/pr-tittle-check.yml
@@ -7,6 +7,8 @@ on:
       - reopened
       - synchronize
       - edited
+  # Report on the queue commit (title is fixed there, so the step below no-ops).
+  merge_group:
 
 permissions:
   pull-requests: write
@@ -17,6 +19,7 @@ jobs:
     steps:
       - name: Validate PR title
         id: validate
+        if: github.event_name != 'merge_group'
         uses: amannn/action-semantic-pull-request@v6.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index c6aa43a8..f7bd93e7 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -3,6 +3,7 @@ name: Dashboard TypeScript
 on:
   push:
     branches:
+      - develop
       - main
   pull_request:
   merge_group:
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index ab12b56c..e7a60406 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -3,6 +3,7 @@ name: UI Tests
 on:
   push:
     branches:
+      - develop
       - main
   pull_request:
   merge_group:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index f395d21f..3c41af0e 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -3,6 +3,7 @@ name: Dashboard Unit Tests
 on:
   push:
     branches:
+      - develop
       - main
   pull_request:
   merge_group: