Skip to content

(chore) enable github merge queue - #354

Open
sandeepkunusoth wants to merge 2 commits into
valkey-io:mainfrom
sandeepkunusoth:merge_group_queue_enable
Open

(chore) enable github merge queue#354
sandeepkunusoth wants to merge 2 commits into
valkey-io:mainfrom
sandeepkunusoth:merge_group_queue_enable

Conversation

@sandeepkunusoth

Copy link
Copy Markdown
Member

This PR fixes #353

Summary

Enables github merge queue. to avoid main branch brokwn state in future.

Changes

  • Enables github merge queue in unit tests, lint and e2e tests.

Implementation

Limitations

Testing

  • update ruleset
    {
      "type": "required_status_checks",
      "parameters": {
        "strict_required_status_checks_policy": true,
        "required_status_checks": [
          {
            "context": "e2e tests"
          },
          {
            "context": "Check formatting"
          },
          {
            "context": "Check go.mod"
          },
          {
            "context": "Run linters"
          },
          {
            "context": "verify generated code"
          }
        ]
      }
    },
    {
      "type": "merge_queue",
      "parameters": {
        "check_response_timeout_minutes": 45,
        "grouping_strategy": "ALLGREEN",
        "max_entries_to_build": 5,
        "max_entries_to_merge": 5,
        "merge_method": "MERGE",
        "min_entries_to_merge": 1,
        "min_entries_to_merge_wait_minutes": 5
      }
    }

Actions needed from maintainer After this PR is merged:

  1. Open Settings → Rules → Rulesets.
  2. Edit the existing ruleset for main.
  3. Enable Require merge queue.
image
  1. Verify the merge queue settings:
    • Merge method: MERGE
    • Minimum entries to merge: 1
    • Wait time: 5 minutes
    • Grouping strategy: ALLGREEN
  2. Verify the required status checks include the workflow job names exactly:
    • e2e tests
    • Check formatting
    • Check go.mod
    • Run linters
    • verify generated code

Checklist

Before submitting the PR make sure the following are checked:

  • This Pull Request is related to one issue.
  • Commit message explains what changed and why
  • Tests are added or updated.
  • Documentation files are updated.
  • I have run pre-commit locally (pre-commit run --all-files or hooks on commit)

@coderabbitai

coderabbitai Bot commented Aug 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: c7b903e6-f996-4f50-b5d5-a4de5b1bbb07

📥 Commits

Reviewing files that changed from the base of the PR and between befa81c and 18d3e21.

📒 Files selected for processing (3)
  • .github/workflows/lint.yml
  • .github/workflows/test-e2e.yml
  • .github/workflows/test.yml
🚧 Files skipped from review as they are similar to previous changes (3)
  • .github/workflows/test.yml
  • .github/workflows/lint.yml
  • .github/workflows/test-e2e.yml

📝 Walkthrough

Walkthrough

The lint, test, and E2E GitHub Actions workflows now run for merge_group events.

Changes

Merge queue CI

Layer / File(s) Summary
Enable merge queue workflow runs
.github/workflows/lint.yml, .github/workflows/test-e2e.yml, .github/workflows/test.yml
The lint, test, and E2E workflows add the merge_group trigger.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the primary change: enabling GitHub merge queue support.
Description check ✅ Passed The description explains the change, implementation intent, required settings, maintainer actions, testing context, and checklist status.
Linked Issues check ✅ Passed The workflow updates add merge_group triggers and support the required merge queue checks described in issue #353.
Out of Scope Changes check ✅ Passed All changes are limited to enabling merge queue events in the lint, test, and E2E workflows.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@sandeepkunusoth sandeepkunusoth changed the title enable github merge queue (chore) enable github merge queue Aug 2, 2026
@greptile-apps

greptile-apps Bot commented Aug 2, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

Adds merge_group triggers to the lint, unit-test, and end-to-end-test workflows so merge-queue commits receive the same checks as pull requests. The three updated workflows were validated successfully: their syntax is accepted and their unguarded jobs run for the default merge-group checks_requested event.

Confidence Score: 5/5

T-Rex T-Rex Logs

What T-Rex did

  • Validated the workflow definitions before and after the change with actionlint.
  • Confirmed that merge_group uses the default checks_requested event when no event type is specified and that lint.yml, test.yml, and test-e2e.yml subscribe to merge-group events.
  • Verified post-change validator success and expected merge-queue execution for lint.yml, test.yml, and test-e2e.yml.

View all artifacts

T-Rex Ran code and verified through T-Rex

Reviews (2): Last reviewed commit: "removed extra line" | Re-trigger Greptile

Signed-off-by: Sandeep Kunusoth <sandeepkunsoth000@gmail.com>
Signed-off-by: Sandeep Kunusoth <sandeepkunsoth000@gmail.com>
@sandeepkunusoth
sandeepkunusoth force-pushed the merge_group_queue_enable branch from befa81c to 18d3e21 Compare August 3, 2026 02:49

@jdheyburn jdheyburn left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fair given that its the second time we've seen main broken.

The alternative is to require PRs to pull from main before merge, which I don't think creates a great DX given the time it takes to run e2e tests.

Will leave this approved but unmerged to let other folks comment.

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.

(chore) Enable GitHub merge queue on main

2 participants