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

fix: lazier directory target extraction #10442

Merged
merged 1 commit into from
Apr 18, 2024

Conversation

rgrinberg
Copy link
Member

If no directory targets are defined, then do not evaluate enabled_if

might fix the bug reported by @anmonteiro

cc @gridbugs

@rgrinberg rgrinberg force-pushed the ps/rr/fix__lazier_directory_target_extraction branch from f269a9c to 95e4606 Compare April 18, 2024 21:19
Copy link
Collaborator

@anmonteiro anmonteiro left a comment

Choose a reason for hiding this comment

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

tested this change and it fixes the build for ocaml-protoc-plugin

src/dune_rules/dir_status.ml Outdated Show resolved Hide resolved
If no directory targets are defined, then do not evaluate enabled_if

Signed-off-by: Rudi Grinberg <[email protected]>

<!-- ps-id: cf8418bc-d40c-4f48-ac10-f4f855944250 -->
@rgrinberg rgrinberg force-pushed the ps/rr/fix__lazier_directory_target_extraction branch from 95e4606 to 1a4631b Compare April 18, 2024 21:29
@rgrinberg rgrinberg merged commit 255111b into main Apr 18, 2024
24 of 27 checks passed
@rgrinberg rgrinberg deleted the ps/rr/fix__lazier_directory_target_extraction branch April 18, 2024 22:04
This was referenced Apr 22, 2024
emillon pushed a commit to emillon/dune that referenced this pull request Apr 22, 2024
If no directory targets are defined, then do not evaluate enabled_if

Signed-off-by: Rudi Grinberg <[email protected]>
@emillon emillon mentioned this pull request Apr 22, 2024
emillon pushed a commit to emillon/dune that referenced this pull request Apr 22, 2024
If no directory targets are defined, then do not evaluate enabled_if

Signed-off-by: Rudi Grinberg <[email protected]>
emillon added a commit that referenced this pull request Apr 23, 2024
* refactor: evaluate directory targets enabled_if in parallel map (#10402)

Signed-off-by: Rudi Grinberg <[email protected]>

* fix: lazier directory target extraction (#10442)

If no directory targets are defined, then do not evaluate enabled_if

Signed-off-by: Rudi Grinberg <[email protected]>

---------

Signed-off-by: Rudi Grinberg <[email protected]>
Co-authored-by: Rudi Grinberg <[email protected]>
emillon added a commit to emillon/opam-repository that referenced this pull request Apr 23, 2024
CHANGES:

### Fixed

- If no directory targets are defined, then do not evaluate `enabled_if`
  (ocaml/dune#10442, @rgrinberg)

- Fix a bug where Coq projects were being rebuilt from scratch each time the
  dependency graph changed. (ocaml/dune#10446, fixes ocaml/dune#10149, @Alizter)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants