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.

Sign up for GitHub

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

Jump to bottom

Bump Miri for panic unwinding support #66558

Merged
merged 3 commits into from
Nov 22, 2019
Merged

Bump Miri for panic unwinding support #66558

merged 3 commits into from
Nov 22, 2019

Conversation

Aaron1011
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 19, 2019
@Aaron1011
Copy link
Member Author

r? @RalfJung

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-11-19T21:35:53.1280514Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-19T21:35:53.1472875Z ##[command]git config gc.auto 0
2019-11-19T21:35:53.1558365Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-19T21:35:53.1633818Z ##[command]git config --get-all http.proxy
2019-11-19T21:35:53.1778623Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66558/merge:refs/remotes/pull/66558/merge
---
2019-11-19T21:39:10.4064694Z ##############################                                            43.0%
2019-11-19T21:39:10.4065049Z ######################################################################## 100.0%
2019-11-19T21:39:10.8155709Z extracting /checkout/obj/build/cache/2019-11-06/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-11-19T21:39:10.8989819Z     Updating crates.io index
2019-11-19T21:39:17.6866430Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-19T21:39:17.6902485Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-19T21:39:17.6952289Z Makefile:67: recipe for target 'prepare' failed
2019-11-19T21:39:17.6952806Z make: *** [prepare] Error 1
2019-11-19T21:39:18.6969049Z Command failed. Attempt 2/5:
2019-11-19T21:39:19.6575176Z     Updating crates.io index
2019-11-19T21:39:19.6575176Z     Updating crates.io index
2019-11-19T21:39:19.6576327Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-19T21:39:19.6576816Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-19T21:39:19.6576939Z make: *** [prepare] Error 1
2019-11-19T21:39:19.6577268Z Makefile:67: recipe for target 'prepare' failed
2019-11-19T21:39:21.1993860Z Command failed. Attempt 3/5:
2019-11-19T21:39:21.3304249Z     Updating crates.io index
2019-11-19T21:39:21.3304249Z     Updating crates.io index
2019-11-19T21:39:21.6881183Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-19T21:39:21.6908337Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-19T21:39:21.6961165Z Makefile:67: recipe for target 'prepare' failed
2019-11-19T21:39:21.6961288Z make: *** [prepare] Error 1
2019-11-19T21:39:24.6980789Z Command failed. Attempt 4/5:
2019-11-19T21:39:24.8238145Z     Updating crates.io index
2019-11-19T21:39:24.8238145Z     Updating crates.io index
2019-11-19T21:39:25.1602737Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-19T21:39:25.1627669Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-19T21:39:25.1683342Z Makefile:67: recipe for target 'prepare' failed
2019-11-19T21:39:25.1683471Z make: *** [prepare] Error 1
2019-11-19T21:39:29.1701200Z Command failed. Attempt 5/5:
2019-11-19T21:39:29.2941861Z     Updating crates.io index
2019-11-19T21:39:29.2941861Z     Updating crates.io index
2019-11-19T21:39:29.6327320Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-11-19T21:39:29.6349705Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-11-19T21:39:29.6405518Z make: *** [prepare] Error 1
2019-11-19T21:39:29.6406425Z Makefile:67: recipe for target 'prepare' failed
2019-11-19T21:39:29.6406921Z The command has failed after 5 attempts.
2019-11-19T21:39:29.6408242Z == clock drift check ==
2019-11-19T21:39:29.6408242Z == clock drift check ==
2019-11-19T21:39:29.6414567Z   local time: Tue Nov 19 21:39:29 UTC 2019
2019-11-19T21:39:29.6773159Z   network time: Tue, 19 Nov 2019 21:39:29 GMT
2019-11-19T21:39:29.6776546Z == end clock drift check ==
2019-11-19T21:39:42.9503507Z 
2019-11-19T21:39:42.9602318Z ##[error]Bash exited with code '1'.
2019-11-19T21:39:42.9635265Z ##[section]Starting: Checkout
2019-11-19T21:39:42.9637130Z ==============================================================================
2019-11-19T21:39:42.9637190Z Task         : Get sources
2019-11-19T21:39:42.9637239Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@RalfJung RalfJung mentioned this pull request Nov 19, 2019
Closed
@RalfJung
Copy link
Member

Ah, we had the same thought. ;) You were slightly faster, so let's use this one.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 19, 2019

📌 Commit 778bb71 has been approved by RalfJung

@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 Nov 19, 2019
@Aaron1011
Copy link
Member Author

@RalfJung: I've updated this PR to include rust-lang/miri#1065. Could you approve the latest commit?

@RalfJung
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 20, 2019

📌 Commit a5c45f0 has been approved by RalfJung

@RalfJung
Copy link
Member

RalfJung commented Nov 22, 2019 •
edited
Loading

Rust master doesn't work with Miri any more: https://travis-ci.com/rust-lang/miri/jobs/259357217

@bors r-

(Miri fix PR: rust-lang/miri#1068)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 22, 2019
@RalfJung
Copy link
Member

@Aaron1011 Miri is fixed, could you update the PR?

@Aaron1011
Copy link
Member Author

@RalfJung: Updated

@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member

(Cycling PR to restart CI.)

@RalfJung RalfJung closed this Nov 22, 2019
@RalfJung RalfJung reopened this Nov 22, 2019
@RalfJung
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2019

📌 Commit 45a9d27 has been approved by RalfJung

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 22, 2019
@bors
Copy link
Contributor

bors commented Nov 22, 2019

⌛ Testing commit 45a9d27 with merge 5fa0af2...

bors added a commit that referenced this pull request Nov 22, 2019
@bors
Auto merge of #66558 - Aaron1011:update/miri-unwind, r=RalfJung
5fa0af2 
Bump Miri for panic unwinding support
@bors
Copy link
Contributor

bors commented Nov 22, 2019

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing 5fa0af2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 22, 2019
@bors bors merged commit 45a9d27 into rust-lang:master Nov 22, 2019
@Aaron1011 Aaron1011 deleted the update/miri-unwind branch November 22, 2019 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@RalfJung RalfJung

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Aaron1011 @rust-highfive @RalfJung @bors @nikomatsakis