Skip to content

Commit 2a552c9

Browse files
Update CI documentation for branch names
1 parent 63cb564 commit 2a552c9

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

src/tests/ci.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,15 @@ Most platforms only run the build steps, some run a restricted set of tests;
102102
only a subset run the full suite of tests (see Rust's [platform tiers]).
103103

104104
Auto jobs are defined in the `auto` section of [`jobs.yml`].
105-
They are executed on the `auto` branch under the `rust-lang/rust` repository,
105+
They are executed on the [`automation/bors/auto`][auto] branch under the `rust-lang/rust` repository,
106106
and the final result will be reported via a comment made by bors on the corresponding PR.
107107
The live results can be seen on [the GitHub Actions workflows page].
108108

109109
At any given time, at most a single `auto` build is being executed.
110110
Find out more in [Merging PRs serially with bors](#merging-prs-serially-with-bors).
111111

112112
[platform tiers]: https://forge.rust-lang.org/release/platform-support.html#rust-platform-support
113+
[auto]: https://github.com/rust-lang/rust/tree/automation/bors/auto
113114

114115
### Try builds
115116

@@ -204,7 +205,7 @@ to help make the perf comparison as fair as possible.
204205
> However, it can be less flexible because you cannot adjust the set of tests
205206
> that are exercised this way.
206207
207-
Try builds are executed on the `try` branch under the `rust-lang/rust` repository and
208+
Try builds are executed on the [`automation/bors/try`][try] branch under the `rust-lang/rust` repository and
208209
their results can be seen on [the GitHub Actions workflows page],
209210
although usually you will be notified of the result by a comment made by bors on
210211
the corresponding PR.
@@ -213,6 +214,7 @@ Multiple try builds can execute concurrently across different PRs, but there can
213214
a single try build running on a single PR at any given time.
214215
215216
[rustc-perf]: https://github.com/rust-lang/rustc-perf
217+
[try]: https://github.com/rust-lang/rust/tree/automation/bors/try
216218
217219
### Modifying CI jobs
218220
@@ -284,8 +286,8 @@ If all the builders are green, the PR is merged, otherwise the failure is
284286
recorded and the PR will have to be re-approved again.
285287

286288
Bors doesn’t interact with CI services directly, but it works by pushing the
287-
merge commit it wants to test to specific branches (like `auto` or `try`), which
288-
are configured to execute CI checks.
289+
merge commit it wants to test to specific branches (like `automation/bors/auto` or `automation/bors/try`),
290+
which are configured to execute CI checks.
289291
Bors then detects the outcome of the build by listening for either Commit Statuses or Check Runs.
290292
Since the merge commit is
291293
based on the latest `main` and only one can be tested at the same time, when

0 commit comments

Comments
 (0)