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

OCaml 5.0 compatibility #11272

Merged
merged 5 commits into from
Sep 15, 2023
Merged

OCaml 5.0 compatibility #11272

merged 5 commits into from
Sep 15, 2023

Conversation

kLabz
Copy link
Contributor

@kLabz kLabz commented Jul 6, 2023

Makes the codebase compatible with both ocaml 4.08 and 5.0. CI now runs for both on linux.

I had to disable StdThread.kill on eval which was probably not even working in the first place. Will likely need to disable it more nicely (from std side?) and cleanup the commented out code.

Closes #11271

@skial skial mentioned this pull request Jul 12, 2023
1 task
@andyli
Copy link
Member

andyli commented Sep 13, 2023

Would you rebase it on top of 4.3.2 such that I can use it as a patch for packaging?

@kLabz
Copy link
Contributor Author

kLabz commented Sep 14, 2023

I can't until I have a new implementation for the memory-related features :/

@andyli
Copy link
Member

andyli commented Sep 14, 2023

I thought you've disabled the memory features temporily in this PR?
It would be nice to have 4.3.2 packages even if the memory features are disabled (I guess they're not critical).
To be clear, I'm not asking for merging into development, but keeping a seperate ocaml-5-ready branch/PR for the 4.3_bugfix branch.

@kLabz
Copy link
Contributor Author

kLabz commented Sep 14, 2023

I updated the lib we needed for memory features so that it works on both ocaml 4.08 and 5.0; I didn't want 4.3.x releases missing features that would break some editor features.

I'm not sure what exactly you need. If this PR produces what you're after, I can backport it to 4.3_bugfix branch tomorrow morning.

@kLabz kLabz marked this pull request as ready for review September 14, 2023 19:07
@kLabz kLabz changed the title Prepare for ocaml5 Ocaml 5.0 compatibility Sep 14, 2023
@kLabz kLabz changed the title Ocaml 5.0 compatibility OCaml 5.0 compatibility Sep 14, 2023
@andyli
Copy link
Member

andyli commented Sep 14, 2023

Great! Thanks a lot for the quick work.

backport it to 4.3_bugfix branch

Yes, that will do. I will than able to generate a patch to apply it on top of the 4.3.2 source.

haxe.opam Outdated Show resolved Hide resolved
kLabz added a commit to kLabz/haxe that referenced this pull request Sep 15, 2023
kLabz added a commit that referenced this pull request Sep 15, 2023
@kLabz kLabz merged commit b4fa334 into HaxeFoundation:development Sep 15, 2023
61 checks passed
@kLabz
Copy link
Contributor Author

kLabz commented Sep 15, 2023

I also pushed to 4.3_bugfix (after checking CI on a separate branch), you'll have to wait a couple hours for CI to complete (arm64.. :/) if you need it otherwise you should be good to go.

@kLabz kLabz deleted the ocaml5-compat branch September 15, 2023 06:51
0b1kn00b pushed a commit to 0b1kn00b/haxe that referenced this pull request Jan 25, 2024
* OCaml 5 compatibility
* [eval] Disable StdThread.kill which has been removed in ocaml 5
* [ci] Build and test with both ocaml 4 and 5 on linux
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OCaml 5 compat
2 participants