Skip to content

Conversation

@Mrtenz
Copy link
Member

@Mrtenz Mrtenz commented Feb 26, 2025

This adds merge_group to the main workflow, enabling us to use the merge queue functionality.

@Mrtenz Mrtenz requested a review from a team as a code owner February 26, 2025 10:08
@codecov
Copy link

codecov bot commented Feb 26, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.91%. Comparing base (ea582cf) to head (9ddc78f).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3162   +/-   ##
=======================================
  Coverage   94.91%   94.91%           
=======================================
  Files         504      504           
  Lines       11134    11134           
  Branches     1711     1711           
=======================================
  Hits        10568    10568           
  Misses        566      566           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Mrtenz Mrtenz force-pushed the mrtenz/merge-group branch from 20e3461 to 9ddc78f Compare February 26, 2025 10:23
@GuillaumeRx
Copy link
Contributor

🥳

@Mrtenz Mrtenz merged commit c1a902e into main Feb 26, 2025
123 checks passed
@Mrtenz Mrtenz deleted the mrtenz/merge-group branch February 26, 2025 10:55
rekmarks added a commit to MetaMask/ocap-kernel that referenced this pull request Jan 14, 2026
Configures the `merge_group` trigger and adds jobs to avoid rerunning
the main workflow in the merge queue per
MetaMask/snaps#3162 and
MetaMask/snaps#3786.

This won't do anything until we've enabled the merge queue for the
default branch in repository settings.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Introduces merge queue awareness and conditional execution to reduce
redundant CI runs.
> 
> - Adds `merge_group` trigger and new `check-skip-merge-queue` job
using `MetaMask/github-tools/.../check-skip-merge-queue@v1` to detect
up-to-date PRs
> - Gates `check-workflows` (and downstream jobs) with `needs`/`if` to
skip when in `merge_group` and `skip-merge-queue` is `true`
> - Updates `all-jobs-pass` to depend on `check-skip-merge-queue` and
succeed if either `all-jobs-complete` passed or `skip-merge-queue` is
`true`
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
0bb82d9. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
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.

4 participants