Skip to content

OCaml 5.4 upgrade #1938

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

Open
wants to merge 11 commits into
base: 504
Choose a base branch
from
Open

OCaml 5.4 upgrade #1938

wants to merge 11 commits into from

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented May 21, 2025

This should fix #1937

@voodoos voodoos changed the title 504 504: bump magic numbers May 21, 2025
@voodoos
Copy link
Collaborator Author

voodoos commented May 22, 2025

@kit-ty-kate looks like it requires pulling more changes than bumping the magic numbers, I will not have the time to do that until Monday unfortunately.

@xvw (@pitag-ha, @PizieDust) do you have the time/ want to have a go at this at this ? (apply all patches in branch 5.4 since commit 3e872717d3691511f4d409f5173455fde1e63ff2)

If not we will do it together on Monday :-)

@voodoos voodoos changed the title 504: bump magic numbers 504: bump magic numbers and upgrade to latest upstream May 26, 2025
Copy link
Member

@kit-ty-kate kit-ty-kate left a comment

Choose a reason for hiding this comment

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

Works for me now. Thanks!

@voodoos
Copy link
Collaborator Author

voodoos commented May 26, 2025

Works for me now. Thanks!

That's great to hear, thanks for the feedback!

Do you think you could cut a preview release with this branch and the corresponding lsp one ? (https://github.com/voodoos/ocaml-lsp.git#504-compat)

@kit-ty-kate
Copy link
Member

now that ocaml 5.4.0~alpha1 has been released, yes

@kit-ty-kate
Copy link
Member

Done in ocaml/opam-repository#27928 and ocaml/opam-repository#27927 using these commands:

  • opam publish --pre-release -v 5.4.2~5.4preview https://github.com/voodoos/merlin/archive/9cd9e4870d5bca509f0f40ee8532ad206a2721a5.tar.gz
  • opam publish --pre-release -v 1.22.1~5.4preview ocaml-lsp-server https://github.com/voodoos/ocaml-lsp/archive/ce8357b4e3f3af77305612640b74ede59638a16f.tar.gz

@voodoos voodoos changed the title 504: bump magic numbers and upgrade to latest upstream OCaml 5.4 upgrade May 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants