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] [ci] Travis testing and compat for OCaml 4.12 #3585

Closed
wants to merge 2 commits into from

Conversation

ejgallego
Copy link
Collaborator

@ejgallego ejgallego commented Jun 29, 2020

OCaml 4.12 has introduced a new field in the Gc.stats record,
forced_major_collections. This makes compilation of Dune fail due to
src/catapult/catapult.ml:fake_gc_stat

We call Gc.quick_stats and override the set of safe fields.

We also add testing of OCaml trunk and 4.11 to Travis, to prevent further problems. This is a non-trivial change so it needs review.

Whether we should place the trunk test in allow_failure is open.

Fixes: #3583, fixes #2298

@ejgallego ejgallego requested a review from emillon as a code owner June 29, 2020 12:07
@ejgallego ejgallego force-pushed the ocaml+412 branch 2 times, most recently from f43feb9 to 5a67841 Compare June 29, 2020 12:10
@ejgallego ejgallego force-pushed the ocaml+412 branch 3 times, most recently from 65be23f to fce6474 Compare June 30, 2020 12:19
OCaml 4.12 has introduced a new field in the `Gc.stats` record,
`forced_major_collections`. This makes compilation of Dune fail due to
`src/catapult/catapult.ml:fake_gc_stat`

We call `Gc.quick_stats` and override the set of safe fields.

Fixes: ocaml#3583

cc: ocaml#2298

Signed-off-by: Emilio Jesus Gallego Arias <e+git@x80.org>
We may want to have some of these tests `allow_failure`.

Fixes ocaml#2298

Signed-off-by: Emilio Jesus Gallego Arias <e+git@x80.org>
@ejgallego ejgallego changed the title [ocaml] Restore compatibility with OCaml 4.12 [ocaml] [ci] Travis testing and compat for OCaml 4.12 Jun 30, 2020
@ejgallego ejgallego requested a review from emillon June 30, 2020 22:58
ejgallego added a commit to ejgallego/coq that referenced this pull request Jun 30, 2020
Recent changes in Coqbot plus the unfortunate breakage OCaml upstream
has make this too noisy.

We will re-enable once ocaml/dune#3585
is accepted upstream.
@@ -26,7 +28,7 @@ let fake_gc_stat =
; compactions = 0
; top_heap_words = 0
; stack_size = 0
}
} [@ocaml.warning "-23"] (* all fiels of record used *)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
} [@ocaml.warning "-23"] (* all fiels of record used *)
} [@ocaml.warning "-23"] (* all fields are used in OCaml < 4.12 *)

fajb pushed a commit to fajb/coq that referenced this pull request Jul 9, 2020
Recent changes in Coqbot plus the unfortunate breakage OCaml upstream
has make this too noisy.

We will re-enable once ocaml/dune#3585
is accepted upstream.
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jul 26, 2020
…lugin, dune-private-libs and dune-glob (2.6.2)

CHANGES:

* Fix compatibility with OCaml 4.12 (ocaml/dune#3585, fixes ocaml/dune#3583, @ejgallego)
@rgrinberg
Copy link
Member

I released 2.6.2 with the fix to 4.12.

fajb pushed a commit to fajb/coq that referenced this pull request Aug 24, 2020
Recent changes in Coqbot plus the unfortunate breakage OCaml upstream
has make this too noisy.

We will re-enable once ocaml/dune#3585
is accepted upstream.
@ejgallego
Copy link
Collaborator Author

Closing this PR as I'm not familiar with Github actions. We should open a bug for testing vs 4.11 and 4.12 tho.

@ejgallego ejgallego closed this Sep 2, 2020
@ejgallego ejgallego deleted the ocaml+412 branch September 2, 2020 16:48
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.

[ocaml] Restore compatibility with OCaml 4.12 [ci] Testing the build with OCaml trunk
3 participants