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

[beta] Update cargo submodule #42040

Merged
merged 1 commit into from
May 21, 2017
Merged

[beta] Update cargo submodule #42040

merged 1 commit into from
May 21, 2017

Conversation

alexcrichton
Copy link
Member

This pulls in a fix for #41797 to the beta branch, and the relevant PR for Cargo
is rust-lang/cargo#4046

Closes #41797

@alexcrichton
[beta] Update cargo submodule
65ba0c1 
This pulls in a fix for rust-lang#41797 to the beta branch, and the relevant PR for Cargo
is rust-lang/cargo#4046

Closes rust-lang#41797
@rust-highfive
Copy link
Collaborator

r? @brson

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

@alexcrichton
Copy link
Member Author

This is a backport of #42039

@arielb1 arielb1 added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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 May 16, 2017
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 20, 2017

📌 Commit 65ba0c1 has been approved by Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum 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 May 20, 2017
@bors
Copy link
Contributor

bors commented May 21, 2017

⌛ Testing commit 65ba0c1 with merge 9f58b0b...

@bors
Copy link
Contributor

bors commented May 21, 2017

💔 Test failed - status-appveyor

@Mark-Simulacrum
Copy link
Member

@bors retry

[00:21:38] FAILED: lib/libLLVMX86Info.a
[00:21:38] cmd.exe /C "cd . && "C:\Program Files (x86)\CMake\bin\cmake.exe" -E remove lib\libLLVMX86Info.a && C:\projects\rust\mingw32\bin\ar.exe qc lib\libLLVMX86Info.a  lib/Tar
[00:21:38] C:\projects\rust\mingw32\bin\ranlib.exe: unable to rename 'lib\libLLVMX86Info.a'; reason: Permission denied^M
[00:21:38] [890/1629] Linking CXX static library lib\libLLVMX86Desc.a
[00:21:38] ninja: build stopped: subcommand failed.
[00:21:38] thread 'main' panicked at '
[00:21:38] command did not execute successfully, got: exit code: 1

@bors
Copy link
Contributor

bors commented May 21, 2017

⌛ Testing commit 65ba0c1 with merge f5b3def...

bors added a commit that referenced this pull request May 21, 2017
@bors
Auto merge of #42040 - alexcrichton:beta-next, r=Mark-Simulacrum
f5b3def 
[beta] Update cargo submodule

This pulls in a fix for #41797 to the beta branch, and the relevant PR for Cargo
is rust-lang/cargo#4046

Closes #41797
@bors
Copy link
Contributor

bors commented May 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing f5b3def to beta...

@bors bors merged commit 65ba0c1 into rust-lang:beta May 21, 2017
@alexcrichton alexcrichton deleted the beta-next branch May 23, 2017 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brson brson

Labels
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.
6 participants
@alexcrichton @rust-highfive @Mark-Simulacrum @bors @brson @arielb1