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.

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

[beta] Cargo does not remove [root] from lockfile with --frozen #45658

Merged
merged 1 commit into from
Oct 31, 2017

Conversation

matklad
Copy link
Member

@matklad matklad commented Oct 31, 2017

Okey, this is supposed to be a backport of rust-lang/cargo#4687, but looks like beta cargo at rust-lang and beta cargo at cargo are different at the moment, hence the huge diff (one commit in the diffrence rewrote every single test file in Cargo)

rust-lang: https://github.com/rust-lang/cargo/commits/463e850146e9454b8b953ff73772a35b286b58e7
cargo: https://github.com/rust-lang/cargo/commits/rust-1.22.0

r? @alexcrichton

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 31, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 31, 2017

📌 Commit db38341 has been approved by alexcrichton

@Mark-Simulacrum
Copy link
Member

@bors p=1

cc @aidanhs Once this lands, and we get a new beta out, crater should be fixed, I think.

@kennytm kennytm 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 Oct 31, 2017
@matklad
Copy link
Member Author

matklad commented Oct 31, 2017

@Mark-Simulacrum has this broken crater somehow? I wonder why we haven't caught this earlier then, the change about [root] was merged a while back...

@bors
Copy link
Contributor

bors commented Oct 31, 2017

⌛ Testing commit db38341 with merge 548cc96...

bors added a commit that referenced this pull request Oct 31, 2017
[beta] Cargo does not remove [root] from lockfile with --frozen

Okey, this is supposed to be a backport of rust-lang/cargo#4687, but looks like beta cargo at rust-lang and beta cargo at cargo are different at the moment, hence the huge diff (one commit in the diffrence rewrote every single test file in Cargo)

rust-lang: https://github.com/rust-lang/cargo/commits/463e850146e9454b8b953ff73772a35b286b58e7
cargo: https://github.com/rust-lang/cargo/commits/rust-1.22.0

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Oct 31, 2017

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

@bors bors merged commit db38341 into rust-lang:beta Oct 31, 2017
@Mark-Simulacrum
Copy link
Member

@matklad Well, the issue with crater is that we generated lockfiles on stable and then tried to use them with beta cargo, which failed, and means that we can't currently (before next beta) run crater on stable vs. beta.

@matklad matklad deleted the beta-backport branch July 9, 2019 12:33
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.

5 participants