Portable lockdirs respects custom solver_env #11933
Open
Conversation
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
gridbugs
force-pushed
the
custom-solver-env-in-portable-lockdir
branch
from
26566d2 to
bf53a60
Compare
ElectreAAS
approved these changes
Jun 25, 2025
| > (repositories mock) | ||
| > (solver_env | ||
| > (sys-ocaml-version 5.4.0+solver-env-version-override) | ||
| > )) |
gridbugs
force-pushed
the
custom-solver-env-in-portable-lockdir
branch
from
bf53a60 to
ad79dce
Compare
This prevents the current system's ocaml version from leaking into the output of tests, and allows testing situations where sys-ocaml-version is overriden in a custom solver environment. Signed-off-by: Stephen Sherratt <[email protected]>
Previously when using portable lockdirs, custom solver variables set in the "solver_env" field of the "lock_dir" stanza in dune-workspace would be ignored. After this change the custom variables are added to the solver env, though they are overriden by settings from the "solve_for_platforms" field. Signed-off-by: Stephen Sherratt <[email protected]>
gridbugs
force-pushed
the
custom-solver-env-in-portable-lockdir
branch
from
ad79dce to
5eba766
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously when using portable lockdirs, custom solver variables set in the "solver_env" field of the "lock_dir" stanza in dune-workspace would be ignored. After this change the custom variables are added to the solver env, though they are overriden by settings from the "solve_for_platforms" field.