Skip to content

[beta] revert #78790, vendor libtest for rustc-src #79571

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

Closed
wants to merge 1 commit into from

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Nov 30, 2020

#78790 caused an issue (#79218) requiring network access for the dist step. Since the primary motivation is for Cargo's build-std which is nightly only, this reverts the change on beta to give us some more time to figure out a better solution. See #79276 (comment) for more context.

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Nov 30, 2020

📌 Commit 00de0a8 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 Nov 30, 2020
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Nov 30, 2020
@bors
Copy link
Collaborator

bors commented Nov 30, 2020

⌛ Testing commit 00de0a8 with merge b909cd7ce115c409d8cfd9846372644234211f31...

@bors
Copy link
Collaborator

bors commented Nov 30, 2020

💔 Test failed - checks-actions

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

ehuss commented Nov 30, 2020

@Mark-Simulacrum I think #79435 needs to be backported to beta. Should I just include it in this PR, or would you prefer a separate PR? Not sure if you are planning to roll up beta PRs together.

@Mark-Simulacrum
Copy link
Member

I'll probably do a rollup this weekend, so I wouldn't worry about including it here -- I don't think there's any rush.

@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Dec 3, 2020
@bors
Copy link
Collaborator

bors commented Dec 4, 2020

⌛ Testing commit 00de0a8 with merge bc0cabcca5ed571fb9173a3e5817b133ec565034...

@bors
Copy link
Collaborator

bors commented Dec 4, 2020

💔 Test failed - checks-actions

@Mark-Simulacrum
Copy link
Member

Closing in favor of #79838.

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 8, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 8, 2020
…ulacrum

[beta] backports

* [beta] always disable copy_file_range to avoid EOVERFLOW errors rust-lang#79008
* Enforce no-move rule of ReentrantMutex using Pin and fix UB in stdio rust-lang#77801
* bootstrap: use the same version number for rustc and cargo rust-lang#79133
* [beta] Revert "Enable ASLR for windows-gnu" rust-lang#79141
* [beta] revert rust-lang#78790, vendor libtest for rustc-src rust-lang#79571
* Mirror centos vault to S3 rust-lang#79435
*  [beta] Update cargo rust-lang#79739

This also bumps to non-dev stable compiler.

r? `@ghost`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants