-
Notifications
You must be signed in to change notification settings - Fork 233
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
Re: Rewrite merlin-completion-at-point integration to be faster and better #1827
base: main
Are you sure you want to change the base?
Changes from 5 commits
da2bb4e
2966b1e
f94912c
97b0244
1054246
49d97d5
a72fd55
38a9982
a05e514
7e137ba
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,20 +15,40 @@ jobs: | |
runs-on: ubuntu-latest | ||
strategy: | ||
matrix: | ||
os: | ||
- ubuntu-latest | ||
ocaml-compiler: | ||
- 5.2.x | ||
emacs_version: | ||
- '27.2' | ||
- '28.2' | ||
- '29.1' | ||
- '29.3' | ||
- snapshot | ||
fail-fast: false # don't stop jobs if one fails | ||
env: | ||
EMACS_PACKAGE_LINT_IGNORE: ${{ matrix.package_lint_ignore }} | ||
EMACS_BYTECOMP_WARN_IGNORE: ${{ matrix.bytecomp_warn_ignore }} | ||
steps: | ||
- uses: purcell/[email protected] | ||
with: | ||
version: ${{ matrix.emacs_version }} | ||
- uses: purcell/[email protected] | ||
voodoos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
version: ${{ matrix.emacs_version }} | ||
|
||
- uses: actions/checkout@v4 | ||
- name: Run tests | ||
run: 'cd emacs && ./check.sh' | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Set-up OCaml ${{ matrix.ocaml-compiler }} | ||
uses: ocaml/setup-ocaml@v3 | ||
with: | ||
ocaml-compiler: ${{ matrix.ocaml-compiler }} | ||
|
||
- name: Install dependencies | ||
run: | | ||
opam pin menhirLib 20201216 --no-action | ||
opam install --yes ppx_string ppx_compare | ||
opam install . --deps-only --with-test --yes | ||
|
||
- name: Build and install | ||
run: | | ||
opam install . --yes | ||
|
||
- name: Run tests | ||
run: 'cd emacs && opam exec -- ./check.sh' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,12 +3,12 @@ | |
# Adapted from https://github.com/purcell/package-lint/blob/master/run-tests.sh | ||
EMACS="${EMACS:=emacs}" | ||
|
||
NEEDED_PACKAGES="package-lint company iedit auto-complete" | ||
NEEDED_PACKAGES="package-lint company iedit auto-complete compat" | ||
|
||
ELS_TO_CHECK=*.el | ||
# To reduce the amount of false positives we only package-lint files | ||
# that are actual installable packages. | ||
PKGS_TO_CHECK="merlin.el merlin-ac.el merlin-company.el merlin-iedit.el" | ||
PKGS_TO_CHECK="merlin.el merlin-ac.el merlin-company.el merlin-iedit.el merlin-cap.el tests/merlin-cap-test.el" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this is right any more. From a packaging point of view, However, presumably the intention is that And There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, I did that in a72fd55. There a still spurious
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah, I was overdue to tag a new |
||
|
||
INIT_PACKAGE_EL="(progn \ | ||
(require 'package) \ | ||
|
@@ -50,3 +50,11 @@ EMACS_PACKAGE_LINT_IGNORE=1 | |
--eval "(require 'package-lint)" \ | ||
-f package-lint-batch-and-exit \ | ||
${PKGS_TO_CHECK} || [ -n "${EMACS_PACKAGE_LINT_IGNORE:+x}" ] | ||
|
||
# Run tests in batch mode. | ||
"$EMACS" -Q -batch \ | ||
--eval "$INIT_PACKAGE_EL" \ | ||
-L . \ | ||
--eval "(progn\ | ||
(load-file \"tests/merlin-cap-test.el\")\ | ||
(ert-run-tests-batch-and-exit))" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.