Skip to content

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Aug 21, 2021

This is a beta backport of #9814.

Includes #9824 to make CI pass.

Move `tmp` test directory.

The `tmp` directory added in rust-lang#9375 was placed within the profile directory (such as `target/debug/tmp` or `target/release/tmp`).  This causes problems for any cargo target (binary, test, etc.) with the name `tmp` as there is a name collision.  This PR attempts to address that by moving the `tmp` directory to the root of the target directory (`target/tmp`), and reserving the profile name "tmp".

Fixes rust-lang#9783
@rust-highfive
Copy link

r? @Eh2406

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

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.55.0. 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 Aug 21, 2021
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 23, 2021

📌 Commit b51ca0e has been approved by alexcrichton

@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 Aug 23, 2021
@bors
Copy link
Contributor

bors commented Aug 23, 2021

⌛ Testing commit b51ca0e with merge ea273c8a9479dab047c538d0f7b136146b63ac66...

@bors
Copy link
Contributor

bors commented Aug 23, 2021

💔 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 Aug 23, 2021
Temporarily disable extern-html-root-url test.

A change in rust-lang/rust#82776 broke this test,
so disabling for now until it is figured out how things are going to work.
@ehuss
Copy link
Contributor Author

ehuss commented Aug 23, 2021

Added #9824 to fix CI.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Aug 23, 2021

📌 Commit 7ab5d49 has been approved by alexcrichton

@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 Aug 23, 2021
@bors
Copy link
Contributor

bors commented Aug 23, 2021

⌛ Testing commit 7ab5d49 with merge 32da73a...

@bors
Copy link
Contributor

bors commented Aug 23, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing 32da73a to rust-1.55.0...

@bors bors merged commit 32da73a into rust-lang:rust-1.55.0 Aug 23, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 27, 2021
[beta] Update cargo

2 commits in 1f76a218bc7f326606dda811b58c42b7e1e21168..32da73ab19417aa89686e1d85c1440b72fdf877d
2021-07-29 22:22:25 +0000 to 2021-08-23 18:16:08 +0000
- [beta] Move `tmp` test directory. (rust-lang/cargo#9819)
- [beta] Bump curl (rust-lang/cargo#9810)
@ehuss ehuss added this to the 1.55.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants