Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

ocaml: add 4.14 #619

Merged
merged 6 commits into from
Apr 21, 2023
Merged

ocaml: add 4.14 #619

merged 6 commits into from
Apr 21, 2023

Conversation

psafont
Copy link
Member

@psafont psafont commented Dec 7, 2022

Update packages to be compatible with ocaml 4.14.

Some packages around ocamlformat need to have 2 versions to be able to work in both versions of the compilers, this affects the artifacts that generated from this version.

Because the ocamlformat version has been changed once we move to ocaml 4.14 the formatting of xapi will need to change accordingly

I would rather wait until 4.14.1 is available before merging this, it is probably a good idea to merge the upstream changes before this one as well.

@lindig lindig self-requested a review December 9, 2022 11:04
@psafont psafont force-pushed the 4.14 branch 3 times, most recently from 0467112 to 2ae3ed8 Compare January 5, 2023 13:39
@psafont psafont force-pushed the 4.14 branch 5 times, most recently from cf0c3bd to c1cce00 Compare January 31, 2023 13:09
@psafont psafont marked this pull request as ready for review January 31, 2023 13:12
@psafont psafont force-pushed the 4.14 branch 2 times, most recently from c9ee381 to 886cae7 Compare January 31, 2023 13:29
@lindig lindig requested review from robhoes and edwintorok February 13, 2023 10:50
@edwintorok
Copy link
Contributor

Dune 3.7 is nearly ready, we may want to include that to also get the bugfix for binary corruption: ocaml/opam-repository#23349

Copy link
Contributor

@edwintorok edwintorok left a comment

Choose a reason for hiding this comment

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

The changes here look good. We might need to adjust a few of the tools/scripts to work with 2 compilers, I can attempt to do those tweaks once the other PR is merged.

psafont added 6 commits April 21, 2023 16:40
Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>
Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>
This version is compatible with 4.14 only

Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>
Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>
Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>
Allow for duplicate packages for ocaml 4.14

Adapt unused packages for new ocamlformat

Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>
@psafont psafont merged commit a1ad187 into xapi-project:master Apr 21, 2023
@psafont psafont deleted the 4.14 branch April 21, 2023 16:41
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants