Commit 5c097fd
authored
chore: Rust checks are required + merge queue (#21941)
Closes #6880
Follow up on #17538 and
#21239
#21239 seems to be working fine
- time to make all the rust changes required to merge it.
This brings two cool things:
1. The most important one - the "merge when ready" button now works 🚀
<img width="923" height="285" alt="image"
src="https://github.com/user-attachments/assets/4f11ecb6-e1d9-473f-815f-b57488042dd3"
/>
You can click this button any time, even right after opening a PR. It
will be automatically merged when:
- all required CI checks (which now include rust) are passing
- you get an approval
I think this should help quite a bit. A lot of people get an approval,
push a nit, and then sit waiting for CI to finish. No more waiting!!
2. We protect ourselves from logical conflicts: cases where develop was
passing before, but someone merged something in the meantime and now
your change is broken on develop - and you don't find out until after
you merge. We hit this almost every month.
One downside: before, clicking merge would happen instantly (although
you had **manually** to wait for tests to be green). With this PR, you
won't have to wait, but it will take 16 minutes to merge (plus, 16 more
to put in the merge queue if you just pushed). But github will do the
work itself and ensure tests are passing on the latest `main`.1 parent 574326c commit 5c097fd
2 files changed
Lines changed: 25 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
63 | 86 | | |
64 | 87 | | |
65 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | 36 | | |
42 | 37 | | |
43 | 38 | | |
| 39 | + | |
| 40 | + | |
44 | 41 | | |
45 | 42 | | |
46 | 43 | | |
| |||
0 commit comments