[3.24.0] backport #14715#15091
Merged
Merged
Conversation
…ocaml#14697) Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
ocaml#14698) …reviews Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
…l#14715) Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Collaborator
Author
|
@anmonteiro could you take a look to see if this makes sense to backport like this? |
Member
|
Discussed earlier today, we can move forward with merging the backport, but would still welcome consideration by @anmonteiro when they have time. |
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
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.
Backport #14715 onto 3.24.0-rc.
Fixes the melange build failure on OCaml 4.14 where dune emits an
I/O error: jscomp/runtime/.melange_src/X.mli: No such file or directoryagainst everymelange-re/melange.*-414reverse dep (see ocaml/opam-repository#29996 — the 3.24.0~alpha2 release PR). The fix is to skip the line directive insetup_melange_sources_copy_ruleswhen a module uses non-staged PPX, since the PPX pipeline now passes-loc-filenameseparately and adding the directive would double-shift diagnostics.The fix has a small precursor chain on
main; bringing the headline#14715alone doesn't apply cleanly because subsequent PRs introduced the test files and machinery the fix's diff targets. Included PRs (chronological):-loc-filename)-loc-filename#14715 — fix: avoid line directive when passing-loc-filename