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 the cargo submodule #43208

Closed
wants to merge 3 commits into from
Closed

[beta] Update the cargo submodule #43208

wants to merge 3 commits into from

Conversation

alexcrichton
Copy link
Member

Notably pull in an update to the jobserver crate to have Cargo set the
CARGO_MAKEFLAGS environment variable instead of the MAKEFLAGS environment
variable.

@rust-highfive
Copy link
Collaborator

r? @brson

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

@alexcrichton alexcrichton mentioned this pull request Jul 13, 2017
Closed
@Mark-Simulacrum
Copy link
Member

@bors r+ p=50

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 451fa08 has been approved by Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r- No point landing this without #43198 -- I'll prepare a patch

@Mark-Simulacrum
Copy link
Member

Included the patch in #43114, once that lands this can as well.

@alexcrichton
Copy link
Member Author

@bors: r+

(behind the queue of #43114)

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 451fa08 has been approved by alexcrichton

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 13, 2017
@alexcrichton
Update the cargo submodule
8734aaa 
Notably pull in an update to the `jobserver` crate to have Cargo set the
`CARGO_MAKEFLAGS` environment variable instead of the `MAKEFLAGS` environment
variable.
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 8734aaa has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 13, 2017

⌛ Testing commit 8734aaa with merge d7d343aee37d9123629dd64a732f9eaffda75b43...

@alexcrichton
Copy link
Member Author

@bors: retry

prioritizing #43114

@bors
Copy link
Contributor

bors commented Jul 13, 2017

⌛ Testing commit 8734aaa with merge aeebab70759c83b5abc58cf04ea1437232cdea0c...

@bors bors mentioned this pull request Jul 13, 2017
Merged
@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Contributor

bors commented Jul 13, 2017

⌛ Testing commit 8734aaa with merge 62015ef4dcc0ac52021aa06a90686df6af10cedd...

@alexcrichton
Copy link
Member Author

@bors: retry

@brson brson mentioned this pull request Jul 13, 2017
Closed
cuviper and others added 2 commits July 13, 2017 12:30
@cuviper @alexcrichton
[beta] Remove rls from the workspace and extended builds
b052eed 
Its git dependencies don't work when building with vendored crates,
so for now it will just be removed from the workspace and disabled in
the rustbuild rules.

cc rust-lang#42719
@brson @alexcrichton
Bump 1.19 prerelease to .4
a3a9164
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit a3a9164 has been approved by Mark-Simulacrum

@alexcrichton alexcrichton mentioned this pull request Jul 13, 2017
Closed
@bors
Copy link
Contributor

bors commented Jul 13, 2017

⌛ Testing commit a3a9164 with merge 5f00fdf347c6ed4b62e2eabcc360c299ae6e5c91...

@alexcrichton
Copy link
Member Author

@bors: retry

@alexcrichton
Copy link
Member Author

I've now folded this all into #43114 (comment)

@alexcrichton alexcrichton deleted the update-cargo2 branch July 13, 2017 20:32
@brson brson mentioned this pull request Jul 14, 2017
Closed
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 @cuviper