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 DEVELOP #10906

Merged
merged 9 commits into from
May 12, 2022

Conversation

Firobe
Copy link
Contributor

@Firobe Firobe commented May 9, 2022

Companion PR for #10896

@Firobe Firobe requested review from a team, imeckler, mrmr1993 and mitschabaude as code owners May 9, 2022 18:29
@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 added the Tweag label May 9, 2022
@Firobe Firobe requested a review from a team as a code owner May 9, 2022 22:57
@Firobe
Copy link
Contributor Author

Firobe commented May 10, 2022

Due to a change in dune, the flags field in js_of_ocaml is now interpreted as flags for both compile and link is dune lang is less than 3. Hence we also must update the dune lang is some places.

@Firobe
Copy link
Contributor Author

Firobe commented May 10, 2022

With the dune lang change, dune now seems to report warnings 32, 34 and 37 as errors, which causes the build to fail.

@Firobe
Copy link
Contributor Author

Firobe commented May 10, 2022

Silencing the warnings in specific places fixes the errors.

@Firobe Firobe force-pushed the upgrade-dune-ocamlformat_DEVELOP branch from 2419691 to bf35e5f Compare May 10, 2022 14:39
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 conflicts

georgeee and others added 7 commits May 10, 2022 22:42
Introduce `mina_block` package instead of `mina_transition`
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 force-pushed the upgrade-dune-ocamlformat_DEVELOP branch from bf35e5f to 1779cc2 Compare May 12, 2022 11:07
@Firobe Firobe merged commit 66da4ad into develop May 12, 2022
@Firobe Firobe deleted the upgrade-dune-ocamlformat_DEVELOP branch May 12, 2022 14:20
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.

5 participants