Fix the compilation of opam on Windows with OCaml >= 5.0 (again)#6216
Merged
kit-ty-kate merged 5 commits intoocaml:masterfrom Oct 8, 2024
Merged
Fix the compilation of opam on Windows with OCaml >= 5.0 (again)#6216kit-ty-kate merged 5 commits intoocaml:masterfrom
kit-ty-kate merged 5 commits intoocaml:masterfrom
Conversation
4c91813 to
b070f1c
Compare
Member
Author
|
I've merged #6211 (with additional improvements) into this PR because it makes more sense as one given this adds an actual CI for Windows + OCaml5. |
3b689af to
95efe56
Compare
95efe56 to
f2ded15
Compare
dra27
approved these changes
Oct 7, 2024
Member
dra27
left a comment
There was a problem hiding this comment.
Notes only - this looks good to go, thank you!
.github/workflows/ci.ml
Outdated
| matrix, []) | ||
| ([], [ | ||
| [("host", "x86_64-pc-cygwin"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)]; | ||
| [("host", "i686-w64-mingw32"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)]; |
Member
There was a problem hiding this comment.
How about having the mingw-w64 i686 test OCaml 5.2.0 and the MSVC i686 test OCaml 4.14.2?
Suggested change
| [("host", "i686-w64-mingw32"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)]; | |
| [("host", "i686-w64-mingw32"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml5)]; |
Member
Author
There was a problem hiding this comment.
I think this would trigger the tests for the platform and it would be way too slow
rjbou
reviewed
Oct 8, 2024
Collaborator
rjbou
left a comment
There was a problem hiding this comment.
Some nitpicking, otherwise, lgtm!!
Commit "GHA: Add OCaml 5.2.0 to the build matrix" adds 5.2.0 and adds also the possibility to have more that 1 version to test on all jobs. Commit text should reflect that, or the commit should be splitted in two.
bc0bcc1 to
e00f163
Compare
e00f163 to
f7e64c7
Compare
…t more than one default version
Windows is an exception since MSVC isn't supported yet (will be in 5.3.0), and Cygwin fails when used in combination with C++ stubs. So only MinGW x86_64 is tested because it's the only one that both works and is reasonably fast to run (i686 is too slow since it's using bytecode).
…upported by master This marginally increases build time (by 30s best case scenario) but is a necessary fix
f7e64c7 to
af04f8b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It seems that after a couple of rebase of #6189 we forgot to commit one change to
OpamStubs.ocaml5.mlwhich actually means that the file doesn't compile (since the Windows+OCaml5 combination wasn't tested in our CI).This here PR should fix this issue for good.
Backported to 2.3 in #6224