-
Notifications
You must be signed in to change notification settings - Fork 129
Ability to normalize workspace member packages' versions for dependency derivation #974
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
Open
vypxl
wants to merge
7
commits into
ipetkov:master
Choose a base branch
from
vypxl:ignore-version-in-deps
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a00d231
Support stripping package version from Cargo.toml files
vypxl 454bf63
Support stripping workspace package versions from Cargo.lock
vypxl dffbd03
fix(mkDummySrc): do not always include unmodified Cargo.lock
vypxl 5ed2957
fix(mkDummySrc): do not depend on source cargo.lock
vypxl 874ce00
test: add checks for doStripVersion
vypxl 03d96f9
docs: docs and changelog for doStripVersion
vypxl b8063b1
test: add compilesFresh tests for doStripVersion
vypxl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -926,6 +926,69 @@ onlyDrvs ( | |
| } | ||
| ); | ||
|
|
||
| # Verify that buildDepsOnly produces the same derivation for different versions | ||
| # when doStripVersion is enabled (versions 1.2.3 and 9.8.7 should produce identical deps) | ||
| # Note: the crate source is in a subdirectory that has the same name for both versions, | ||
| # to avoid name differences triggering a cache miss | ||
| stripVersionDepsEquality = | ||
| let | ||
| depsV1 = myLib.buildDepsOnly { | ||
| src = ./stripVersion/sources; | ||
| doStripVersion = true; | ||
| }; | ||
| depsV2 = myLib.buildDepsOnly { | ||
| src = ./stripVersionAlt/sources; | ||
| doStripVersion = true; | ||
| }; | ||
| in | ||
| pkgs.runCommand "strip-version-deps-equality-check" { } '' | ||
| if [ "${depsV1}" != "${depsV2}" ]; then | ||
| echo "ERROR: buildDepsOnly derivations differ despite doStripVersion=true" | ||
| echo " stripVersion (1.2.3): ${depsV1}" | ||
| echo " stripVersionAlt (9.8.7): ${depsV2}" | ||
| exit 1 | ||
| fi | ||
| echo "SUCCESS: buildDepsOnly derivations are identical with doStripVersion=true" | ||
| touch $out | ||
| ''; | ||
|
|
||
| # Verify that buildDepsOnly produces DIFFERENT derivations when doStripVersion is disabled | ||
| # This ensures the equality check above is meaningful | ||
| stripVersionDepsInequality = | ||
| let | ||
| depsV1 = myLib.buildDepsOnly { | ||
| src = ./stripVersion/sources; | ||
| doStripVersion = false; | ||
| }; | ||
| depsV2 = myLib.buildDepsOnly { | ||
| src = ./stripVersionAlt/sources; | ||
| doStripVersion = false; | ||
| }; | ||
| in | ||
| pkgs.runCommand "strip-version-deps-inequality-check" { } '' | ||
| if [ "${depsV1}" = "${depsV2}" ]; then | ||
| echo "ERROR: buildDepsOnly derivations are identical despite doStripVersion=false" | ||
| echo " This means the test is not meaningful - versions should differ!" | ||
| echo " stripVersion (1.2.3): ${depsV1}" | ||
| echo " stripVersionAlt (9.8.7): ${depsV2}" | ||
| exit 1 | ||
| fi | ||
| echo "SUCCESS: buildDepsOnly derivations differ with doStripVersion=false (as expected)" | ||
| echo " stripVersion (1.2.3): ${depsV1}" | ||
| echo " stripVersionAlt (9.8.7): ${depsV2}" | ||
| touch $out | ||
| ''; | ||
|
|
||
| compilesFreshSimpleStripVersion = self.compilesFresh "simple" (myLib.cargoBuild) { | ||
| src = ./simple; | ||
| doStripVersion = true; | ||
| }; | ||
|
|
||
| compilesFreshStripVersion = self.compilesFresh "strip-version-test" (myLib.cargoBuild) { | ||
| src = ./stripVersion/sources; | ||
| doStripVersion = true; | ||
| }; | ||
|
Comment on lines
+987
to
+990
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test is failing. You can iterate on it directly via |
||
|
|
||
| windows = myLibWindows.buildPackage { | ||
| strictDeps = true; | ||
| pname = "windows"; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just leaving a note for later, the changelog entry will need to move under the
Unreleased(after a merge or rebase withmaster) since there was a new release that went out