Fix CI to fetch master on beta channel#86472
Merged
bors merged 1 commit intorust-lang:masterfrom Jun 21, 2021
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
force-pushed
the
fix-ci-beta
branch
from
3dfb125 to
61b453c
Compare
Member
|
@bors r+ |
Collaborator
|
📌 Commit 61b453c has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 21, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#86192 (Make OR_PATTERNS_BACK_COMPAT be a 2021 future-incompatible lint) - rust-lang#86248 (Add a regression test for issue-85113) - rust-lang#86274 (Spaces) - rust-lang#86349 (Add regression test for issue rust-lang#78632) - rust-lang#86424 (rustfmt: load nested out-of-line mods correctly) - rust-lang#86472 (Fix CI to fetch master on beta channel) - rust-lang#86473 (Rustdoc: Account for const-unstable functions) - rust-lang#86495 (Improve `proc_macro::{Punct, Spacing}` documentation) - rust-lang#86503 (Fix rust.css fonts.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This forward-ports a fix from the beta channel (landing in #86413, hopefully) to master so that we don't need to apply it on each round of backports.
This bug also demonstrates that our channel-checking is a bit insufficient -- stable is checked, but beta has some of its own peculiarities currently and isn't checked. But this does not attempt to adjust for that; we likely can't afford to run both beta and stable channels by CI and the current state here seems OK for now.
r? @pietroalbini