@@ -156,20 +156,19 @@ More information about these commands can be found at the [shortcuts documentati
156
156
157
157
## The merging process
158
158
159
- After a reviewer has approved your PR, they will issue a command to the [ bors ]
160
- bot (also known as "Homu", the software that powers [ ` @bors ` ] ). Bors will
161
- create a temporary branch with your PR, and run all tests. Only if all tests
162
- pass will it merge the PR to master. If it fails, the bot will leave a comment
163
- on the PR. This system ensures that the master branch is always in a good
164
- state, and that merges are processed one at a time. The [ Homu queue
165
- dashboard ] [ homu-cargo ] shows the current merge queue. Cargo's queue is rarely
166
- busy, but a busy project like the [ rust repo ] [ homu-rust ] is constantly full .
159
+ After a reviewer has approved your PR,
160
+ they will add the PR to [ GitHub merge queue ] .
161
+ The merge queue will create a temporary branch with your PR,
162
+ and run all required jobs.
163
+ If it fails, it will be removed from the queue.
164
+ The merge queue ensures that the master branch is always in a good state,
165
+ and that merges are processed one at a time.
166
+ The [ merge queue dashboard ] shows the current queued pull requests .
167
167
168
168
Assuming everything works, congratulations! It may take at least a week for
169
169
the changes to arrive on the nightly channel. See the [ release chapter] for
170
170
more information on how Cargo releases are made.
171
171
172
-
173
172
[ development-models ] : https://help.github.com/articles/about-collaborative-development-models/
174
173
[ create pull requests ] : https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
175
174
[ how-to-fork ] : https://docs.github.com/en/github/getting-started-with-github/fork-a-repo
@@ -179,10 +178,8 @@ more information on how Cargo releases are made.
179
178
[ how-to-clone ] : https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository
180
179
[ Testing chapter ] : ../tests/index.md
181
180
[ GitHub's keywords ] : https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue
182
- [ bors ] : https://buildbot2.rust-lang.org/homu/
183
- [ `@bors` ] : https://github.com/bors
184
- [ homu-cargo ] : https://buildbot2.rust-lang.org/homu/queue/cargo
185
- [ homu-rust ] : https://buildbot2.rust-lang.org/homu/queue/rust
181
+ [ GitHub merge queue ] : https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
182
+ [ merge queue dashboard ] : https://github.com/rust-lang/cargo/queue/master
186
183
[ release chapter ] : release.md
187
184
[ internals forum ] : https://internals.rust-lang.org/c/tools-and-infrastructure/cargo
188
185
[ file an issue ] : https://github.com/rust-lang/cargo/issues
0 commit comments