Navigation Menu

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

Jump to bottom

build-support/rust: specify proper path to Cargo.lock #81762

Closed
wants to merge 2 commits into from
Closed

build-support/rust: specify proper path to Cargo.lock #81762

wants to merge 2 commits into from

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Mar 4, 2020

Motivation for this change

When building a crate from a subdir (specified by sourceRoot), the
diffing fails as the builder tries to compare source/Cargo.lock to the
one in $cargoDepsCopy.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Ma27 added 2 commits March 4, 2020 21:48
@Ma27
cargo-raze: 0.2.10 -> 0.2.15
7bdb8d0
@Ma27
build-support/rust: specify proper path to Cargo.lock
5115fed 
When building a crate from a subdir (specified by `sourceRoot`), the
diffing fails as the builder tries to compare `source/Cargo.lock` to the
one in `$cargoDepsCopy`.
@Ma27 Ma27 requested a review from bhipple March 4, 2020 20:56
@Ma27 Ma27 requested a review from andir as a code owner March 4, 2020 20:56
@ofborg ofborg bot added the 6.topic: rust label Mar 4, 2020
@ofborg ofborg bot requested a review from elasticdog March 4, 2020 21:06
bhipple
bhipple requested changes Mar 5, 2020
View reviewed changes
Copy link
Contributor

@bhipple bhipple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fixed on the staging branch, and will be good to go once merged to master. See here for details:
#80262

I've cherry-picked your first commit onto a local checkout of staging and verified it builds with no other changes required, so I guess there are three choices:

A) Send the PR bumping cargo-raze to staging, or
B) Send the PR to master, but keep using the legacy fetcher until the bugfix makes its way to master, or
C) Wait for staging to merge to master, then send the PR bumping cargo-raze

I'm OK with any of them, and if you keep using the legacy fetcher I'll clean it up once staging merges to master.

@Ma27
Copy link
Member Author

Ma27 commented Mar 7, 2020

I see. I guess I should've looked at staging first before filing that patch, sorry! Will push the cargo-raze update as soon as all changes are on master.

@Ma27 Ma27 closed this Mar 7, 2020
@Ma27 Ma27 deleted the cargo-lock-sourceroot branch March 7, 2020 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bhipple bhipple bhipple requested changes

@andir andir Awaiting requested review from andir

@elasticdog elasticdog Awaiting requested review from elasticdog

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ma27 @bhipple