Integrate miri into build-manifest #57484
Merged
Conversation
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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @Mark-Simulacrum or @kennytm |
src/tools/build-manifest/src/main.rs
Outdated
| @@ -297,6 +304,7 @@ impl Builder { | |||
| self.llvm_tools_version = self.version("llvm-tools", "x86_64-unknown-linux-gnu"); | |||
| // lldb is only built for macOS. | |||
| self.lldb_version = self.version("lldb", "x86_64-apple-darwin"); | |||
| self.miri_version = self.version("miri", "x86_64-apple-darwin"); | |||
There was a problem hiding this comment.
Hm, this should probably be a Linux triple, not macOS?
Suggested change
| self.miri_version = self.version("miri", "x86_64-apple-darwin"); | |
| self.miri_version = self.version("miri", "x86_64-unknown-linux-gnu"); |
|
r=me modulo my comment |
This was referenced Jan 10, 2019
This was referenced Jan 10, 2019
|
Fixes #57488. |
|
@dwijnand thanks, I added that to the OP (GH doesn't seem to recognize it as a magic marker otherwise). |
This fixes a mistake where miri was accidentally left out of the build-manifest parsing, meaning that today's nightly generated a manifest with invalid urls!
alexcrichton
force-pushed
the
fix-nightlies
branch
from
1fda345 to
dd326f8
Compare
|
@bors: r=Mark-Simulacru |
|
📌 Commit dd326f8 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit dd326f8 with merge e0f385c5b385b48330e8ba84288989dd699a01de... |
|
💥 Test timed out |
bors
added
S-waiting-on-review
|
@bors: retry |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jan 10, 2019
Integrate miri into build-manifest This fixes a mistake where miri was accidentally left out of the build-manifest parsing, meaning that today's nightly generated a manifest with invalid urls! Fixes #57488.
|
☀️ Test successful - checks-travis, status-appveyor |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This fixes a mistake where miri was accidentally left out of the
build-manifest parsing, meaning that today's nightly generated a
manifest with invalid urls!
Fixes #57488.