Unify the dependency system using DuneRocqPlugins#229
Merged
rlepigre-skylabs-ai merged 3 commits intomainfrom Feb 27, 2026
Merged
Unify the dependency system using DuneRocqPlugins#229rlepigre-skylabs-ai merged 3 commits intomainfrom
rlepigre-skylabs-ai merged 3 commits intomainfrom
Conversation
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | 014bde5 |
| fmdeps/BRiCk/ | main | 4ce7328 |
| fmdeps/auto/ | main | f336ece |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 927947d |
| bluerock/bhv/ | skylabs-main | 5a39ba2 |
| fmdeps/brick-libcpp/ | main | 53842f7 |
| fmdeps/ci/ | main | d5ff6c5 |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | 46ed5a6 |
| psi/protos/ | main | 8fe3e7c |
| psi/backend/ | main | 28d4321 |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 6c7fffd |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122612.2 | 122612.2 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100147.9 | 100147.9 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122612.2 | 122612.2 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100147.9 | 100147.9 | +0.0 | └ proofs and tests |
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | 014bde5 |
| fmdeps/BRiCk/ | main | 4ce7328 |
| fmdeps/auto/ | main | f336ece |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 927947d |
| bluerock/bhv/ | skylabs-main | 5a39ba2 |
| fmdeps/brick-libcpp/ | main | 53842f7 |
| fmdeps/ci/ | main | d5ff6c5 |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | 46ed5a6 |
| psi/protos/ | main | 8fe3e7c |
| psi/backend/ | main | dae1b6b |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 6c7fffd |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| +0.00% | 122612.2 | 122612.2 | +0.0 | total |
| +0.00% | 22464.3 | 22464.3 | +0.0 | ├ translation units |
| +0.00% | 100147.9 | 100147.9 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| +0.00% | 122612.2 | 122612.2 | +0.0 | total |
| +0.00% | 22464.3 | 22464.3 | +0.0 | ├ translation units |
| +0.00% | 100147.9 | 100147.9 | +0.0 | └ proofs and tests |
Contributor
Author
|
@rlepigre-skylabs-ai When I was debugging yesterday, it seems like when |
gmalecha-at-skylabs
force-pushed
the
feat/task-modifiers
branch
from
490b5ba to
286aef3
Compare
Contributor
That, I expect. You do have a dune project in your test directory, so it does have a dune source root. However, since the workspace doesn't have the plugin, it should be looked for in its "installed" form (via |
gmalecha-at-skylabs
force-pushed
the
feat/task-modifiers
branch
2 times, most recently
from
6505457 to
04aac2e
Compare
gmalecha-at-skylabs
force-pushed
the
feat/unify-dependency-system
branch
from
3c4d82c to
0d7b9f4
Compare
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | df5c229 |
| fmdeps/BRiCk/ | main | f324984 |
| fmdeps/auto/ | main | 682490e |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 0c0b4de |
| bluerock/bhv/ | skylabs-main | b1ca30d |
| fmdeps/brick-libcpp/ | main | dc9818e |
| fmdeps/ci/ | main | 7712f8c |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | bd2e46c |
| psi/protos/ | main | 8fe3e7c |
| psi/backend/ | main | d0258c8 |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 62ed81e |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122651.7 | 122651.7 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122651.7 | 122651.7 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
rlepigre-skylabs-ai
force-pushed
the
feat/unify-dependency-system
branch
from
0d7b9f4 to
c1b65af
Compare
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | 73e492a |
| fmdeps/BRiCk/ | main | f324984 |
| fmdeps/auto/ | main | 682490e |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 0c0b4de |
| bluerock/bhv/ | skylabs-main | b1ca30d |
| fmdeps/brick-libcpp/ | main | dc9818e |
| fmdeps/ci/ | main | 7712f8c |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | bd2e46c |
| psi/protos/ | main | 8fe3e7c |
| psi/backend/ | main | 05f1187 |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 62ed81e |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122651.7 | 122651.7 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122651.7 | 122651.7 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | 73e492a |
| fmdeps/BRiCk/ | main | f324984 |
| fmdeps/auto/ | main | 682490e |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 0c0b4de |
| bluerock/bhv/ | skylabs-main | b1ca30d |
| fmdeps/brick-libcpp/ | main | dc9818e |
| fmdeps/ci/ | main | 7712f8c |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | 430933c |
| psi/protos/ | main | 8fe3e7c |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 62ed81e |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| +0.00% | 122651.7 | 122651.7 | +0.0 | total |
| +0.00% | 22464.3 | 22464.3 | +0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| +0.00% | 122651.7 | 122651.7 | +0.0 | total |
| +0.00% | 22464.3 | 22464.3 | +0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
rlepigre-skylabs-ai
force-pushed
the
feat/unify-dependency-system
branch
from
e98fb68 to
74ae5ba
Compare
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | 73e492a |
| fmdeps/BRiCk/ | main | f324984 |
| fmdeps/auto/ | main | 682490e |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 0c0b4de |
| bluerock/bhv/ | skylabs-main | b1ca30d |
| fmdeps/brick-libcpp/ | main | dc9818e |
| fmdeps/ci/ | main | 7712f8c |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | 430933c |
| psi/protos/ | main | 8fe3e7c |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 62ed81e |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| +0.00% | 122651.7 | 122651.7 | +0.0 | total |
| +0.00% | 22464.3 | 22464.3 | +0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| +0.00% | 122651.7 | 122651.7 | +0.0 | total |
| +0.00% | 22464.3 | 22464.3 | +0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
Contributor
|
From today's meeting:
|
Contributor
|
The potential issue with this change is if people build a project that also exists in an installed form. |
The [-boot] flag is systematically introduced by dune, but prevents Rocq from picking up installed packages. The ideal fix would be to add [-package] options for installed packages, but the option is not yet available. So when installed packages are required, we remove the [-boot] option. We also remove the "opam exec --" prefix when invoking [ocamlfind], since it does not seem to work well with cram tests.
This does two things: - Also adds _build/default/install/bin to the path. - Avoids using DUNE_SOURCEROOT variable name.
rlepigre-skylabs-ai
force-pushed
the
feat/unify-dependency-system
branch
from
74ae5ba to
65c07cf
Compare
|
|
||
| # HACK: make sure to allow loading installed plugins. | ||
| if needs_installed_plugin: | ||
| rocq_args.remove("-boot") |
Contributor
There was a problem hiding this comment.
I have now implemented a better version, that only removes -boot when installed libraries are needed. This should be more robust in our common case, while still covering the installed use-case.
CI summary (Details)Active Repos
|
| Repo | Job Branch | Job Commit |
|---|---|---|
| ./ | main | 73e492a |
| fmdeps/BRiCk/ | main | f324984 |
| fmdeps/auto/ | main | 682490e |
| fmdeps/auto-docs/ | main | 9f57097 |
| bluerock/NOVA/ | skylabs-proof | 0c0b4de |
| bluerock/bhv/ | skylabs-main | b1ca30d |
| fmdeps/brick-libcpp/ | main | dc9818e |
| fmdeps/ci/ | main | 7712f8c |
| vendored/elpi/ | skylabs-master | aa4475f |
| fmdeps/fm-ci/ | main | 262fb04 |
| fmdeps/fm-tools/ | main | 430933c |
| psi/protos/ | main | 8fe3e7c |
| psi/ide/ | main | 6b596cf |
| psi/data/ | main | 62ed81e |
| vendored/rocq/ | skylabs-master | 2ede3c9 |
| vendored/rocq-elpi/ | skylabs-master | 103a742 |
| vendored/rocq-equations/ | skylabs-main | a8c4832 |
| vendored/rocq-ext-lib/ | skylabs-master | 94a6630 |
| vendored/rocq-iris/ | skylabs-master | 3ad4ddd |
| vendored/rocq-lsp/ | skylabs-main | a8b7272 |
| vendored/rocq-stdlib/ | skylabs-master | bc07423 |
| vendored/rocq-stdpp/ | skylabs-master | e01d802 |
| fmdeps/skylabs-fm/ | main | 7d620c1 |
| vendored/vsrocq/ | skylabs-main | 5b4527e |
Performance
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122651.7 | 122651.7 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
Full Results
| Relative | Master | MR | Change | Filename |
|---|---|---|---|---|
| -0.00% | 122651.7 | 122651.7 | -0.0 | total |
| -0.00% | 22464.3 | 22464.3 | -0.0 | ├ translation units |
| +0.00% | 100187.4 | 100187.4 | +0.0 | └ proofs and tests |
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
3 participants
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.
This attempts to port all of the "plugin" infrastructure to
DuneRocqPlugin, but I can't seem to figure out how to make it work with cram tests. It seems like the assumptions of theDuneRocqPluginlogic might be being violated in cram tests.