Respect potentially existing lock dir when running format rules#12847
Merged
Leonidas-from-XIV merged 2 commits intoocaml:mainfrom Dec 5, 2025
Merged
Conversation
Leonidas-from-XIV
force-pushed
the
respect-existing-lock-dir
branch
from
4d62876 to
1c08e84
Compare
Sudha247
approved these changes
Dec 5, 2025
Collaborator
Sudha247
left a comment
Sudha247
left a comment
There was a problem hiding this comment.
The change looks sensible to me.
However, I'm afraid the working of the environment flag may not be known? Quick look up at https://dune.readthedocs.io/en/stable/index.html didn't find me anything, so maybe we should include it in the docs? (This is unrelated to the PR, and shouldn't block it).
Collaborator
Author
|
The flag is one of the flags that were enabled in the Dune Developer Preview and being phased out in the nightly. So I think it is more on the verge of being removed in the future. |
Signed-off-by: Marek Kubica <marek@tarides.com>
Signed-off-by: Marek Kubica <marek@tarides.com>
Leonidas-from-XIV
force-pushed
the
respect-existing-lock-dir
branch
from
1c08e84 to
85ff100
Compare
davesnx
added a commit
to davesnx/dune
that referenced
this pull request
Dec 8, 2025
…without-system * 'main' of github.com:/ocaml/dune: (30 commits) Add (files) stanza (ocaml#12879) Make sure to use string equality in parsing hot path (ocaml#12874) Hoist up [Dune_sexp.Decoder.sum] uses (ocaml#12876) Delay ocaml-index dependencies (ocaml#12881) Simplify Lib.requires (ocaml#12880) Lib: delay applying modules (ocaml#12884) Annotate some ignored parameters in lib.ml (ocaml#12883) feat: expand variables in `(promote (into ..))` (ocaml#12832) dune-binaries.t: nix ci (ocaml#12875) fix: greedy version location in lang declarations (ocaml#12869) Reproduction case for ocaml#6220. (ocaml#6221) Defunctionalize the dune sexp decoder (ocaml#12768) disable flake (ocaml#12873) refactor: [instantiate] takes a regular library (ocaml#12849) Respect potentially existing lock dir when running format rules (ocaml#12847) fix: ascii start chore: updated CR someday chore: added entry for CHANGES.md fix: else claude message tests: promoted non-ascii-characters.t to new logic ...
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
2 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.
The reason that we check the flag first is because unless running with
LOCK_DEV_TOOLwe are not implicitly creating a lock dir for the dev tool. But there might still be an eligible dev tool lock dir (created bydune tools install ocamlformatpreviously) so we should still check it.Closes #12839.