Skip to content

Conversation

@Nikhil-Manglore
Copy link
Member

@Nikhil-Manglore Nikhil-Manglore commented Nov 7, 2025

This pull requests adds GitHub merge queue functionality to automate testing and merging of pull requests. After a pull request meets the requirements that we set in GitHub settings, it will be added to the merge queue. We can also select the setting that allows us to manually add the PR to the queue. We can choose the number of PRs that we want in the queue at a time (batch size). All these PRs that are currently in the queue will then be added to the unstable branch and tested against all the daily tests. If they pass, all the PRs in the queue will be merged into unstable. This is a useful feature to see which commits can impact the daily tests. If the tests fail against the batch then the merge queue will split up each individual commit and test it against the daily tests to find out which commit is causing the failure.

Settings that need to be enabled

  1. Enable Merge Queue in Settings (Settings -> General -> Pull Requests)
  2. To Be Completed

I set it to run all the daily tests except the valgrind and macOS tests.

Resolves #2086

@Nikhil-Manglore Nikhil-Manglore marked this pull request as draft November 7, 2025 21:40
@hpatro
Copy link
Collaborator

hpatro commented Nov 7, 2025

Also we currently run all the daily tests which I think is inefficient. We should decided which subset of the daily tests we want to run in the merge queue and I can update the PR.

@Nikhil-Manglore Ideally the non flaky ones 😀. Do we continue running daily on unstable with this setup ?

@Nikhil-Manglore
Copy link
Member Author

Also we currently run all the daily tests which I think is inefficient. We should decided which subset of the daily tests we want to run in the merge queue and I can update the PR.

@Nikhil-Manglore Ideally the non flaky ones 😀. Do we continue running daily on unstable with this setup ?

Yes the daily will still be run on it's normal schedule in unstable. The merge queue will use the daily tests before PRs are merged into unstable. Marking this PR for draft right now because I want to run a few more tests on my personal test github org.

@codecov
Copy link

codecov bot commented Nov 7, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.41%. Comparing base (7e0b3bb) to head (010fb45).
⚠️ Report is 52 commits behind head on unstable.

Additional details and impacted files
@@             Coverage Diff              @@
##           unstable    #2820      +/-   ##
============================================
- Coverage     72.58%   72.41%   -0.18%     
============================================
  Files           128      128              
  Lines         71326    70415     -911     
============================================
- Hits          51772    50989     -783     
+ Misses        19554    19426     -128     

see 105 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@roshkhatri
Copy link
Member

FYI This also adds the same workflow call in daily as this PR:#2702

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.

[NEW] Adding merge queue to unstable branch

3 participants