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: