Skip to content

feat: enable merge queue for automated testing#40

Merged
clouatre merged 1 commit intomainfrom
feat/merge-queue-setup
Dec 7, 2025
Merged

feat: enable merge queue for automated testing#40
clouatre merged 1 commit intomainfrom
feat/merge-queue-setup

Conversation

@clouatre
Copy link
Copy Markdown
Member

@clouatre clouatre commented Dec 7, 2025

Add merge queue support for automated testing with proper job conditions.

Changes:

  • Add merge_group trigger to CI workflow
  • Add concurrency group to cancel in-progress runs
  • Add if conditions to all test jobs to properly handle merge_group events
  • Condition: github.event_name == 'push' || github.event.pull_request.draft == false || github.event_name == 'merge_group'
  • Enable auto-merge on repository
  • Update ruleset with:
    • Required status checks for all 4 test jobs
    • Merge queue with SQUASH method
    • HEADGREEN grouping strategy
    • Non-fast-forward and deletion rules

This mirrors the setup from setup-kiro-action PR #11.

Ruleset ID: 10005985

- Add if condition to all test jobs to handle merge_group events
- Condition: github.event_name == 'push' || github.event.pull_request.draft == false || github.event_name == 'merge_group'
- Also add merge_group trigger and concurrency settings for merge queue support
@clouatre clouatre force-pushed the feat/merge-queue-setup branch from 94ed8f5 to ad7502e Compare December 7, 2025 17:56
@clouatre clouatre added this pull request to the merge queue Dec 7, 2025
Merged via the queue into main with commit 1501096 Dec 7, 2025
4 checks passed
@clouatre clouatre deleted the feat/merge-queue-setup branch December 7, 2025 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant