Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

build-manifest: stop generating numbered channel names except for stable #77854

Merged
merged 1 commit into from
Oct 12, 2020

Conversation

pietroalbini
Copy link
Member

This fixes numbered channel names being created for the nightly channel, and once the root cause of this rides the trains, for beta.

r? @Mark-Simulacrum

This fixes numbered channel names being created for the nightly channel,
and once the root cause of this rides the trains, for beta.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2020
@pietroalbini
Copy link
Member Author

This was caused by #77336.

@Mark-Simulacrum
Copy link
Member

@bors r+ p=5

@bors
Copy link
Contributor

bors commented Oct 12, 2020

📌 Commit 5973fd4 has been approved by Mark-Simulacrum

@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 Oct 12, 2020
@pietroalbini
Copy link
Member Author

@rustbot modify labels: beta-nominated t-infra

@rustbot rustbot added beta-nominated Nominated for backporting to the compiler in the beta channel. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 12, 2020
@bors
Copy link
Contributor

bors commented Oct 12, 2020

⌛ Testing commit 5973fd4 with merge f3ab6f0...

@bors
Copy link
Contributor

bors commented Oct 12, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing f3ab6f0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2020
@bors bors merged commit f3ab6f0 into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
@pietroalbini pietroalbini added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 14, 2020
@pietroalbini pietroalbini deleted the ETOOMANYCHANNELS branch October 20, 2020 14:05
@pietroalbini pietroalbini modified the milestones: 1.49.0, 1.48.0 Oct 20, 2020
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 20, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 20, 2020
[beta] Rollup backports

Cherry-picked:

*  Always use the Rust version in package names rust-lang#77336
*  rustc_parse: More precise spans for `tuple.0.0` rust-lang#77774
*  Update crossbeam-channel to avoid UB rust-lang#77819
*  build-manifest: stop generating numbered channel names except for stable rust-lang#77854
*  Dist build manifest rust-lang#77762
*  bootstrap: set correct path for the build-manifest binary rust-lang#77909

r? `@ghost`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants