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

Upgrade dune and ocamlformat + reformat files #10896

Merged
merged 5 commits into from
May 12, 2022

Conversation

Firobe
Copy link
Contributor

@Firobe Firobe commented May 9, 2022

This PR upgrades dune to version 3.1.1 (see reasons why). A necessary side-effect is upgrading ocamlformat, which unfortunately implies reformatting most files. Most reformatting changes are simply spaces added before closing parentheses.

The current .ocamlformat is edited by removing deprecated and removed options (which were set to their default values anyway). The file was already as explicit as possible, so the reformatting changes cannot be minimized further.

This PR also add the ocp-browser package to the switch, to help easily exploring installed interfaces.

Test:

  • successful local builds on both compatible and develop
  • the CI

Closes #10816

@Firobe Firobe added the ci-build-me Add this label to trigger a circle+buildkite build for this branch label May 9, 2022
@Firobe Firobe marked this pull request as ready for review May 9, 2022 18:28
@Firobe Firobe requested review from a team as code owners May 9, 2022 18:28
@Firobe
Copy link
Contributor Author

Firobe commented May 9, 2022

Since the reformat is always a moving target, waiting for approval on both this PR and #10906 before rebasing and solving the conflicts. Also need to update container images for this branch.

@Firobe Firobe mentioned this pull request May 9, 2022
@Firobe Firobe added the Tweag label May 9, 2022
Copy link
Contributor

@lk86 lk86 left a comment

Choose a reason for hiding this comment

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

Approved, modulo fixing the conflicts again

Upgrade to dune 3.1.1, ocamlformat 20.1 (the two are tied).
Also fix incoherences between root and installed in the opam export, and
add the useful ocp-browser.
All of the values were set to their default values, so there is no
functional change.
@Firobe Firobe merged commit 53a3e9e into compatible May 12, 2022
@Firobe Firobe deleted the upgrade-dune-ocamlformat branch May 12, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-build-me Add this label to trigger a circle+buildkite build for this branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants