azure: Fix some minor issues which have broken our configuration #61546
Merged
bors merged 2 commits intorust-lang:masterfrom Jun 5, 2019
Merged
azure: Fix some minor issues which have broken our configuration #61546bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Member
alexcrichton
commented
Jun 5, 2019
- 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!
Member
Author
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
emilyalbini
reviewed
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.
Member
Author
|
@bors: r=pietroalbini rollup |
Collaborator
|
📌 Commit fb3bd58 has been approved by |
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
Member
Author
|
@bors: r=pietroalbini rollup |
Collaborator
|
📌 Commit fb3bd58 has been approved by |
Member
|
@alexcrichton wait, you reapproved this after it was included in a rollup currently testing. |
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.