Skip to content

Integrate miri into build-manifest#57484

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:fix-nightlies
Jan 11, 2019
Merged

Integrate miri into build-manifest#57484
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:fix-nightlies

Conversation

@alexcrichton

@alexcrichton alexcrichton commented Jan 10, 2019

Copy link
Copy Markdown
Member

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.

@rust-highfive

Copy link
Copy Markdown
Contributor

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 Jan 10, 2019
@alexcrichton

Copy link
Copy Markdown
Member Author

cc @oli-obk and #57086 (just making sure y'all are aware!)

@bors: p=1000

(fixes nightly releases)

@alexcrichton

Copy link
Copy Markdown
Member Author

r? @Mark-Simulacrum or @kennytm

Comment thread src/tools/build-manifest/src/main.rs Outdated

@Mark-Simulacrum Mark-Simulacrum Jan 10, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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");

@Mark-Simulacrum

Copy link
Copy Markdown
Member

r=me modulo my comment

@dwijnand

Copy link
Copy Markdown
Contributor

Fixes #57488.

@RalfJung

Copy link
Copy Markdown
Member

@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

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacru

@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit dd326f8 has been approved by Mark-Simulacru

@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 Jan 10, 2019
@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dd326f8 with merge e0f385c5b385b48330e8ba84288989dd699a01de...

@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@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 Jan 10, 2019
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: retry

@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 Jan 10, 2019
@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dd326f8 with merge c2d381d...

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.
@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Mark-Simulacru
Pushing c2d381d to master...

@bors bors merged commit dd326f8 into rust-lang:master Jan 11, 2019
@alexcrichton alexcrichton deleted the fix-nightlies branch March 12, 2019 20:26
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.

Can't install nightly-2019-01-10

8 participants