Skip to content

[beta] rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel #43022

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.

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

Merged
merged 2 commits into from
Jul 4, 2017

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Jul 3, 2017

This is a backport of #42977 for beta

Keruspe added 2 commits July 3, 2017 11:12
This brings in tests fixes and the new handling of __CARGO_DEFAULT_LIB_METADATA

Signed-off-by: Marc-Antoine Perennou <[email protected]>
@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@Keruspe
Copy link
Contributor Author

Keruspe commented Jul 3, 2017

r? @alexcrichton

@Mark-Simulacrum
Copy link
Member

I think this needs to update Cargo.lock as well? Something like cargo update -p https://github.com/rust-lang/cargo#0.21.0 --manifest-path src/Cargo.toml should work, with a different version number perhaps.

@Keruspe
Copy link
Contributor Author

Keruspe commented Jul 3, 2017

@Mark-Simulacrum Out of curiosity, what would require such a change? There's no Cargo.toml change in this pull request

@Mark-Simulacrum
Copy link
Member

Right, but if you look at the Cargo.lock, https://github.com/rust-lang/rust/blob/beta/src/Cargo.lock#L149, the git commit hash is included. Cargo.toml has https://github.com/rust-lang/rust/blob/beta/src/Cargo.toml#L39, which is version-based, which is why it doesn't need an update.

@Mark-Simulacrum
Copy link
Member

It's possible that in practice, this doesn't matter, since we use the submodule for Cargo and (perhaps?) Cargo ignores the commit hash in the submodule when utilizing the Cargo from there. The PR builder doesn't actually build the "extended" release so it's hard to check what happens based on that...

@Keruspe
Copy link
Contributor Author

Keruspe commented Jul 3, 2017

Interresting.
Fwiw, i run the extended build locally and it went just fine (and doesn't seem to have updated Cargo.lock in the process)

@Mark-Simulacrum
Copy link
Member

@alexcrichton Do you know if Cargo currently checks the git commit hash from Cargo.lock against submodules? It feels based on the above that it doesn't, which seems somewhat unfortunate...

@alexcrichton
Copy link
Member

@bors: r+

@Mark-Simulacrum yeah I think it's definitely clear there's a bug/downside or two to how we redirect the rls to depend on the Cargo in-tree ...

@bors
Copy link
Collaborator

bors commented Jul 3, 2017

📌 Commit 427cbbc has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jul 4, 2017

⌛ Testing commit 427cbbc with merge c064c87...

bors added a commit that referenced this pull request Jul 4, 2017
[beta] rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel

This is a backport of #42977 for beta
@bors
Copy link
Collaborator

bors commented Jul 4, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing c064c87 to beta...

@bors bors merged commit 427cbbc into rust-lang:beta Jul 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants