Enable merge queues (#11162)
This commit is contained in:
@@ -3,17 +3,25 @@ concurrency:
|
|||||||
group: ci-${{ github.head_ref || github.run_id }}
|
group: ci-${{ github.head_ref || github.run_id }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
on:
|
on:
|
||||||
# # Triggers the workflow on push but only for the main branches
|
# Full CI now runs in the merge queue instead of on post-merge push. PRs build a
|
||||||
push:
|
# narrowed board subset (--level pr) for fast feedback; the merge queue rebuilds
|
||||||
|
# the full release matrix against the merged result before it lands. Because the
|
||||||
|
# merge_group run is the gate, there is nothing left to rebuild after the merge
|
||||||
|
# commit reaches the protected branch - so the old `push` trigger is dropped.
|
||||||
|
#
|
||||||
|
# merge_group events have an empty github.head_ref, so the existing setup job
|
||||||
|
# (which keys off GITHUB_HEAD_REF) produces the full matrix automatically.
|
||||||
|
# Note: merge_group does not support paths/paths-ignore filters - it always runs
|
||||||
|
# the full required checks, which is what a merge queue needs (branch protection
|
||||||
|
# cannot skip a required check).
|
||||||
|
merge_group:
|
||||||
|
types: [checks_requested]
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- develop
|
- develop
|
||||||
- pioarduino # Remove when merged // use `feature/` in the future.
|
- pioarduino # Remove when merged // use `feature/` in the future.
|
||||||
- event/*
|
- event/*
|
||||||
- feature/*
|
- feature/*
|
||||||
paths-ignore:
|
|
||||||
- "**.md"
|
|
||||||
- version.properties
|
|
||||||
|
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
|
|||||||
Reference in New Issue
Block a user