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.

Sign up for GitHub

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

Jump to bottom

wip: compatibility with merlin-lib 5.1-502 #1233

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

wip: compatibility with merlin-lib 5.1-502 #1233

wants to merge 15 commits into from
+171 −333

Commits on Jun 14, 2024

  1. Compatibility with merlin-lib 5.0-502 

    Use merlin-lib config types and utilities

Bump  merlin-lib and ocaml-format versions
    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    8cdd8b7 View commit details
    Browse the repository at this point in the history

  2. update action_inline to new function representation 

    Note: function applications will only be eliminated when they are fully applied
and none of the arguments are labeled.
    @jfeser @rgrinberg
    jfeser authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    0e350f9 View commit details
    Browse the repository at this point in the history

  3. e2e: promote new tests results

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    2d86cf3 View commit details
    Browse the repository at this point in the history

  4. Only test 5.2 in CI since backward compatibility is currently lost. 

    This is due to Typedtree incompatibilities.
    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    115b5cb View commit details
    Browse the repository at this point in the history

  5. windows ci ?

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    81ffa2c View commit details
    Browse the repository at this point in the history

  6. and again

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    4ddc6b5 View commit details
    Browse the repository at this point in the history

  7. Support project wide occurrences

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    47aa744 View commit details
    Browse the repository at this point in the history

  8. Pin Merlin in the CI

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    aa0e42e View commit details
    Browse the repository at this point in the history

  9. Move to ppx_expect v0.17.0

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    924ab2c View commit details
    Browse the repository at this point in the history

  10. Disable windows CI until setup-ocaml is fixed

    @voodoos @rgrinberg
    voodoos authored and rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    7652b20 View commit details
    Browse the repository at this point in the history

  11. Revert "Move to ppx_expect v0.17.0" 

    This reverts commit 9ee0aab.
    @rgrinberg
    rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    8a99bec View commit details
    Browse the repository at this point in the history

  12. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    b70c42d View commit details
    Browse the repository at this point in the history

  13. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    716ea85 View commit details
    Browse the repository at this point in the history

  14. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    cc4cccb View commit details
    Browse the repository at this point in the history

  15. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    0573158 View commit details
    Browse the repository at this point in the history