Conversation
Alizter
force-pushed
the
push-xqrvnkkslqoo
branch
4 times, most recently
from
August 17, 2026 11:50
168b8e3 to
f1ce544
Compare
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Alizter
force-pushed
the
push-xqrvnkkslqoo
branch
2 times, most recently
from
August 17, 2026 14:13
0c002b7 to
ef65fcb
Compare
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Capture the current behavior where different requested platforms may select different versions of the same package. The joint-solver feature updates this expectation to the intended all-platform failure. Signed-off-by: Ali Caglayan <alizter@gmail.com>
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Build one SAT universe for every requested platform instead of solving each platform independently. Enforce one version per package name across platforms while allowing different package-name alternatives, evaluate availability and local-package constraints in each platform environment, and minimize distinct avoid-version package versions. Keep the single-platform SAT encoding unchanged, preserve each selected platform package when extracting lock data, and only copy extra files for selected package versions. Signed-off-by: Ali Caglayan <alizter@gmail.com>
Portable autolock failures bypass the command-line lock handler that normally adds the solve_for_platforms hint. Expose the hint with the solver failure and attach it in the autolock path as well, so both explicit and automatic locking explain how to request a smaller platform set. Signed-off-by: Ali Caglayan <alizter@gmail.com>
Duplicate solve_for_platforms entries created duplicate platform roles and repeated conditional metadata. Deduplicate platform overlays before constructing the joint solve while preserving the user's first-occurrence order. Signed-off-by: Ali Caglayan <alizter@gmail.com>
Use the conditional lock-file representation for every newly generated lock directory and remove the portable-lock-dir feature flag and split code paths. Keep old lock directories readable: bare atom-form dependency fields decode as all-platform dependencies, and legacy bare build/install actions continue to run on every platform. Signed-off-by: Ali Caglayan <alizter@gmail.com>
The SAT-side conflict class constraint is per-platform, but the diagnostics check keyed its classes map by class name only, so a class holder selected on one platform could cause candidates on another platform to be reported as class-conflicting, a rejection the per-platform SAT never applied. Key the diagnostics map by (class, platform) to match. Signed-off-by: Ali Caglayan <alizter@gmail.com>
Alizter
force-pushed
the
push-xqrvnkkslqoo
branch
from
August 17, 2026 16:32
ef65fcb to
4b6b983
Compare
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
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.
Stacked on #15988. Only the final commit is new in this draft.
Summary
Tests
dune runtest test/blackbox-tests/test-cases/pkg/conflicts.t test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-platform-dependant-version-extra-files.tdune build @fmt @check