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: don't take build lock for coq top --no-build #10547

Merged
merged 1 commit into from
May 29, 2024
Merged

Conversation

lzy0505
Copy link
Contributor

@lzy0505 lzy0505 commented May 17, 2024

This fixes #7671 where dune coq top tries to take the global build lock even if --no-build is enabled.

The problem was that Common.Builder.term had allow_builds set to true by default and didn't get updated when --no-build was specified. This led to the creation of an RPC server at initialization, which triggers the lock.

The fix was to update allow_builds to false with Common.Builder.forbid_builds.

@Alizter
Copy link
Collaborator

Alizter commented May 23, 2024

@rlepigre could you test this?

@rlepigre
Copy link
Contributor

@rlepigre could you test this?

@Alizter I gave this PR a quick try, and it seems to do the trick. Thanks for the fix @lzy0505!

@Alizter
Copy link
Collaborator

Alizter commented May 28, 2024

@lzy0505 Could you add a changelog entry? Have a look at doc/changes to see how it is done. Once that is done, we can probably merge.

Signed-off-by: Zongyuan Liu <liuzongyuan0505@gmail.com>
@lzy0505
Copy link
Contributor Author

lzy0505 commented May 28, 2024

@Alizter Done.

@Alizter
Copy link
Collaborator

Alizter commented May 28, 2024

Thanks this looks good. @rgrinberg @emillon this is ready for merging.

@rgrinberg rgrinberg added this to the 3.16.0 milestone May 29, 2024
@rgrinberg rgrinberg merged commit 86b8a6d into ocaml:main May 29, 2024
27 of 28 checks passed
MA0010 pushed a commit to MA0010/dune that referenced this pull request Jun 5, 2024
Signed-off-by: Zongyuan Liu <liuzongyuan0505@gmail.com>
gridbugs added a commit to gridbugs/opam-repository that referenced this pull request Jun 5, 2024
CHANGES:

### Added

- allow libraries with the same `(name ..)` in projects as long as they don't
  conflict during resolution (via `enabled_if`). (ocaml/dune#10307, @anmonteiro,
  @jchavarri)

- `dune describe pp` now finds the exact module and the stanza it belongs to,
  instead of guessing the name of the preprocessed file. (ocaml/dune#10321, @anmonteiro)

- Print the result of `dune describe pp` with the respective dialect printer.
  (ocaml/dune#10322, @anmonteiro)

- Add new flag `--context` to `dune ocaml-merlin`, which allows to select a
  Dune context when requesting Merlin config. Add `dune describe contexts`
  subcommand. Introduce a field `generate_merlin_rules` for contexts declared
  in the workspace, that allows to optionally produce Merlin rules for other
  contexts besides the one selected for Merlin (ocaml/dune#10324, @jchavarri)

- melange: add include paths for private library `.cmj` files during JS
  emission. (ocaml/dune#10416, @anmonteiro)

- `dune ocaml-merlin`: communicate additional directives `SOURCE_ROOT`,
  `UNIT_NAME` (the actual name with wrapping) and `INDEX` with the paths to the
  index(es). (ocaml/dune#10422, @voodoos)

- Add a new alias `@ocaml-index` that uses the `ocaml-index` binary to generate
  indexes that can be read by tools such as Merlin to provide project-wide
  references search. (ocaml/dune#10422, @voodoos)

- merlin: add optional `(merlin_reader CMD)` construct to `(dialect)` stanza to
  configure a merlin reader (ocaml/dune#8567, @andreypopp)

### Changed

- melange: treat private libraries with `(package ..)` as public libraries,
  fixing an issue where `import` paths were wrongly emitted. (ocaml/dune#10415,
  @anmonteiro)

- install `.glob` files for Coq theories too (ocaml/dune#10602, @ejgallego)

### Fixed

- Don't try to document non-existent libraries in doc-new target (ocaml/dune#10319, fixes
  ocaml/dune#10056, @jonludlam)

- Make `dune-site`'s `load_all` function look for `META` files so that it
  doesn't fail on empty directories in the plugin directory (ocaml/dune#10458, fixes
  ocaml/dune#10457, @shym)

- Fix incorrect warning for libraries defined inside non-existant directories
  using `(subdir ..)` and used by executables using `dune-build-info` (ocaml/dune#10525,
  @rgrinberg)

- Don't try to take build lock when running `coq top --no-build` (ocaml/dune#10547, fixes
  ocaml/dune#7671, @lzy0505)

- Make sure to truncate dune's lock file after locking and unlocking so that
  users cannot observe incorrect pid's (ocaml/dune#10575, @rgrinberg)

- mdx: link mdx binary with `byte_complete`. This fixes `(libraries)` with
  foreign archives on Linux. (ocaml/dune#10586, fixes ocaml/dune#10582, @anmonteiro)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Running "dune coq top --no-build ..." tries to take the lock
4 participants