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

azure: Fix some minor issues which have broken our configuration #61546

Merged
merged 2 commits into from
Jun 5, 2019

Conversation

alexcrichton
Copy link
Member

  • Ensure that when we enable IPv6 for Docker on Linux that the various directories before writing a config file
  • Delete a previously installed rustup if any since it seems to interfere with Cargo's test suite.

Looks like the Azure image changed recently so let's account for that!
@alexcrichton
Copy link
Member Author

r? @pietroalbini

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2019
Looks like Azure has updated images recently to install Rust by default,
but that can interfere with our own compiler (for example Cargo's test
suite we think) so be sure to uninstall it before proceeding.
@alexcrichton
Copy link
Member Author

@bors: r=pietroalbini rollup

@bors
Copy link
Contributor

bors commented Jun 5, 2019

📌 Commit fb3bd58 has been approved by pietroalbini

@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 Jun 5, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 5, 2019
azure: Fix some minor issues which have broken our configuration

* Ensure that when we enable IPv6 for Docker on Linux that the various directories before writing a config file
* Delete a previously installed rustup if any since it seems to interfere with Cargo's test suite.
bors added a commit that referenced this pull request Jun 5, 2019
Rollup of 5 pull requests

Successful merges:

 - #61503 (Fix cfg(test) build for x86_64-fortanix-unknown-sgx)
 - #61534 (Edit docs of ExitStatus)
 - #61536 (Don't allow using const fn arguments as "args_required_const")
 - #61538 (Don't use GNU noexec stack note)
 - #61546 (azure: Fix some minor issues which have broken our configuration )

Failed merges:

r? @ghost
@alexcrichton
Copy link
Member Author

@bors: r=pietroalbini rollup

@bors
Copy link
Contributor

bors commented Jun 5, 2019

📌 Commit fb3bd58 has been approved by pietroalbini

@pietroalbini
Copy link
Member

@alexcrichton wait, you reapproved this after it was included in a rollup currently testing.

@bors bors merged commit fb3bd58 into rust-lang:master Jun 5, 2019
@alexcrichton alexcrichton deleted the fix-azure branch June 5, 2019 21:28
@alexcrichton
Copy link
Member Author

Ah that was my bad, I pushed a commit here by accident and then removed the commit, but that messes up bors. In any case looks like it got figured out.

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