-
Notifications
You must be signed in to change notification settings - Fork 951
Implemented a merge queue for PRs #2820
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: unstable
Are you sure you want to change the base?
Conversation
Signed-off-by: Nikhil Manglore <nmanglor@amazon.com>
Signed-off-by: Nikhil Manglore <nmanglor@amazon.com>
Signed-off-by: Nikhil Manglore <nmanglor@amazon.com>
@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 Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## unstable #2820 +/- ##
============================================
- Coverage 72.58% 72.45% -0.14%
============================================
Files 128 128
Lines 71326 70415 -911
============================================
- Hits 51772 51017 -755
+ Misses 19554 19398 -156 🚀 New features to boost your workflow:
|
|
FYI This also adds the same workflow call in daily as this PR:#2702 |
Signed-off-by: Nikhil Manglore <nmanglor@amazon.com>
Signed-off-by: Nikhil Manglore <nmanglor@amazon.com>
|
Pull Request is ready for review now. I will fix formatting errors soon |
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.
Check here for more information on merge queues: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue
Settings that need to be enabled
Add Rule)require merge queueand input the desired settings under this section.require status checks to pass before mergingsection in settings.I set it to run all the daily tests except the valgrind and macOS tests.
Example Runs in my own test org: https://github.com/Merge-Queue-Test-For-Valkey/merge-queue-test/actions/runs/19626527240/job/56196367079
Note: #2702 also modifies the daily.yml file. Assuming that PR is merged first I will go back and rebase this PR since we both add workflow calls.
Resolves #2086