Skip to content

Give a better error message when x.py uses the wrong stage for CI #76796

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 19, 2020
Merged

Give a better error message when x.py uses the wrong stage for CI #76796

merged 1 commit into from
Sep 19, 2020

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Sep 16, 2020

@jyn514 jyn514 added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Sep 16, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2020
@shepmaster
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 16, 2020

📌 Commit be37265 has been approved by shepmaster

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 16, 2020
@jyn514
Copy link
Member Author

jyn514 commented Sep 16, 2020

@bors rollup=always

@jyn514 jyn514 added A-diagnostics Area: Messages for errors, warnings, and lints T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 16, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 19, 2020
@RalfJung
Rollup merge of rust-lang#76796 - jyn514:wrong-stage, r=shepmaster
10c1ddb 
Give a better error message when x.py uses the wrong stage for CI

r? @shepmaster
@RalfJung RalfJung mentioned this pull request Sep 19, 2020
Closed
@RalfJung RalfJung mentioned this pull request Sep 19, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 19, 2020
@bors
Auto merge of rust-lang#76912 - RalfJung:rollup-q9ur56h, r=RalfJung
8e9d5db 
Rollup of 14 pull requests

Successful merges:

 - rust-lang#73963 (deny(unsafe_op_in_unsafe_fn) in libstd/path.rs)
 - rust-lang#75099 (lint/ty: move fns to avoid abstraction violation)
 - rust-lang#75502 (Use implicit (not explicit) rules for promotability by default in `const fn`)
 - rust-lang#75580 (Add test for checking duplicated branch or-patterns)
 - rust-lang#76310 (Add `[T; N]: TryFrom<Vec<T>>` (insta-stable))
 - rust-lang#76400 (Clean up vec benches bench_in_place style)
 - rust-lang#76434 (do not inline black_box when building for Miri)
 - rust-lang#76492 (Add associated constant `BITS` to all integer types)
 - rust-lang#76525 (Add as_str() to string::Drain.)
 - rust-lang#76636 (assert ScalarMaybeUninit size)
 - rust-lang#76749 (give *even better* suggestion when matching a const range)
 - rust-lang#76757 (don't convert types to the same type with try_into (clippy::useless_conversion))
 - rust-lang#76796 (Give a better error message when x.py uses the wrong stage for CI)
 - rust-lang#76798 (Build fixes for RISC-V 32-bit Linux support)

Failed merges:

r? `@ghost`
@bors bors merged commit 404cce0 into rust-lang:master Sep 19, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 19, 2020
@jyn514 jyn514 deleted the wrong-stage branch September 19, 2020 13:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@shepmaster shepmaster

Labels
A-diagnostics Area: Messages for errors, warnings, and lints A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jyn514 @shepmaster @bors @rust-highfive @rustbot