[3.24.1] backport #14904 with CI fixes - #15569
Merged
Merged
Conversation
…caml#14904) When generating jsoo library archive rules on demand, resolve the library stanza the same way Ml_sources does: evaluate enabled_if and pick the enabled stanza rather than the first one matching by name. Fixes an internal error (modules_and_obj_dir: failed lookup) when a dune file defines two libraries with the same name distinguished by mutually exclusive enabled_if clauses, as ocaml-re does for ppx_expect_common. Fixes ocaml#14775. (cherry picked from commit b0313ac) Signed-off-by: Shon Feder <shon.feder@gmail.com>
(cherry picked from commit d015282) Signed-off-by: Shon Feder <shon.feder@gmail.com>
6.4.0 broke our CI: - wasm tests fail outright on wasm_of_ocaml-compiler 6.4.0 - jsoo cram tests fail on js_of_ocaml(-compiler) 6.4.0 because the artifact path moved from .js/default/... to .js/effects=disabled/... Pin both in the dune.opam.template (with-dev-setup deps) so `make dev-deps` solves to <6.4, and pin the wasm CI job explicitly to .6.3.2 since it doesn't go through the dune dev-setup solve. Signed-off-by: Ali Caglayan <alizter@gmail.com>
melange 7.0.0-54 was released and breaks the melange cram tests on main: the compiler now emits extra Hint: lines on warnings (e.g. 'illegal-backslash') that the expected outputs don't include. Cap the with-dev-setup melange dep in dune.opam.template at < "7.0" so make dev-deps stays on the 6.x line until the cram tests are updated. Signed-off-by: Ali Caglayan <alizter@gmail.com>
Signed-off-by: Ali Caglayan <alizter@gmail.com>
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
2 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.
Replaces #15457 with a branch we can update.
Backports #14904 and its changelog from #15441. It retains the existing js/wasm_of_ocaml 6.4 compatibility pin and adds two CI-only compatibility fixes:
wasm_of_ocaml-compiler.6.0.1+ox1, matching the package set pinned by the release branch rather than advancing its flake and test expectations.These extra changes address CI dependency drift and are not release regressions.
No local tests run; CI is the validation for these platform-specific dependency constraints.