Open
Conversation
Contributor
Author
This stack of pull requests is managed by Graphite. Learn more about stacking. |
40c41d5 to
461edaf
Compare
kopecs
commented
Jan 28, 2026
| build: | ||
| docker: | ||
| - image: returntocorp/ocaml:ubuntu | ||
| - image: ocaml/opam:debian-ocaml-5.4 |
Contributor
Author
There was a problem hiding this comment.
What is the preferred image here?
Contributor
Author
|
I still need to do more testing and updates for dependent repos which use this as a submodule (since there is some reliance on symlinks to certain makefiles or scripts here :/), but that shouldn't be a barrier to merging this subject to code review. |
1 task
461edaf to
d21c9b5
Compare
yosefAlsuhaibani
approved these changes
Jan 29, 2026
Contributor
yosefAlsuhaibani
left a comment
There was a problem hiding this comment.
We went talked through this PR in person, seems good. We should think of bumping the submodule in ocaml-tree-sitter-semgrep, it would be nice if we'd wait merging this till the build there succeeds, but also that's just me being paranoid.
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.

Moves the build from being dependent on a combination of dune and make to just use dune. This should help simplify things and help make using different versions of tree-sitter a bit easier, since they could be included as different dune projects, rather than needing to handle mutating symlinks in this included as a submodule. This also helps to address some version differences that would create issues with that approach (cf. #106).
One issue with the previous approach was that the version of tree-sitter linked against may not have been the downloaded version. For the versions we have historically been on, this should be OK, since the ABI was compatible and our grammars don't have the current tree-sitter.json config file introduced in (circa) v.0.24.0, so generated code should also use ABI 14. But this may soon no longer be true and would become a barrier to updating grammars where upstream requires a more current version.
This also helps improve build caching, since dune is now aware of more of the dependency graph.
Security