Skip to content

Test Emacs parts on the released 28.1 as well#1454

Merged
voodoos merged 5 commits intoocaml:masterfrom
mattiase:emacs-ci-version-update
Nov 23, 2022
Merged

Test Emacs parts on the released 28.1 as well#1454
voodoos merged 5 commits intoocaml:masterfrom
mattiase:emacs-ci-version-update

Conversation

@mattiase
Copy link
Copy Markdown
Contributor

@mattiase mattiase commented Apr 11, 2022

28.1 was recently released; snapshot tracks the development version (with some lag).
Oh, and 28.1 in YAML is a number so I prefer the quotes to make it a string just in case.

@mattiase mattiase mentioned this pull request May 7, 2022
Open
@voodoos
Copy link
Copy Markdown
Collaborator

voodoos commented Jun 23, 2022

It is worth noting that the lint erros don't trigger CI failures. It was meant to have the log readily available for when we want to fix them:


merlin-ac.el:1:0: warning: The package summary should not end with a period.
merlin-ac.el:135:0: error: "ac-merlin-locate" doesn't start with package's prefix "merlin-ac".
merlin-cap.el:1:0: error: Package should have a ;;; Commentary section.
merlin-cap.el:1:0: warning: The package summary should not end with a period.
merlin-cap.el:1:87: warning: You should depend on (emacs "24.1") if you need lexical-binding.
merlin-cap.el:21:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-cap.el:24:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-cap.el:72:0: error: Aliases should start with the package's prefix "merlin-cap".
merlin-company.el:1:0: warning: The package summary should not end with a period.
merlin-iedit.el:1:0: error: package.el cannot parse this buffer: Search failed: ";;; merlin-iedit.el ends here"
merlin-imenu.el:1:0: error: Package should have a ;;; Commentary section.
merlin-imenu.el:1:0: warning: The package summary should not end with a period.
merlin-imenu.el:1:75: warning: You should depend on (emacs "24.1") if you need lexical-binding.
merlin-imenu.el:10:3: warning: You should include standard keywords: see the variable `finder-known-keywords'.
merlin-imenu.el:11:7: error: Package URLs should be a single HTTPS or HTTP URL.
merlin-imenu.el:14:10: error: You should depend on (emacs "24.4") if you need `subr-x'.
merlin-imenu.el:18:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-imenu.el:19:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-imenu.el:20:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-imenu.el:21:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-imenu.el:22:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-imenu.el:23:1: error: You should depend on (emacs "24.3") if you need `defvar-local'.
merlin-imenu.el:102:0: error: "merlin-use-merlin-imenu" doesn't start with package's prefix "merlin-imenu".
merlin-xref.el:1:0: warning: "Version:" or "Package-Version:" header is missing. MELPA will handle this, but other archives will not.
merlin-xref.el:1:0: error: Package should have a ;;; Commentary section.
merlin-xref.el:1:0: error: Package should have a Homepage or URL header.
merlin-xref.el:1:0: error: package.el cannot parse this buffer: Package lacks a file header
merlin-xref.el:1:7: warning: You should depend on (emacs "24.1") if you need lexical-binding.
merlin-xref.el:2:10: error: You should depend on (emacs "24.3") or the cl-lib package if you need `cl-lib'.
merlin-xref.el:3:10: error: You should depend on (emacs "25.1") if you need `xref'.
merlin-xref.el:16:1: error: You should depend on (emacs "25.1") or the cl-lib package if you need `cl-defmethod'.
merlin-xref.el:19:35: error: You should depend on (emacs "25.1") if you need `alist-get'.
merlin-xref.el:20:8: error: You should depend on (emacs "25.1") if you need `xref-make'.
merlin-xref.el:21:19: error: You should depend on (emacs "25.1") if you need `xref-make-buffer-location'.
merlin-xref.el:24:1: error: You should depend on (emacs "25.1") or the cl-lib package if you need `cl-defmethod'.
merlin-xref.el:26:16: error: You should depend on (emacs "25.1") if you need `alist-get'.
merlin-xref.el:27:15: error: You should depend on (emacs "25.1") if you need `alist-get'.
merlin-xref.el:28:16: error: You should depend on (emacs "25.1") if you need `alist-get'.
merlin-xref.el:29:15: error: You should depend on (emacs "25.1") if you need `alist-get'.
merlin-xref.el:33:15: error: You should depend on (emacs "25.1") if you need `xref-make'.
merlin-xref.el:33:31: error: You should depend on (emacs "25.1") if you need `xref-make-file-location'.
merlin-xref.el:35:1: error: You should depend on (emacs "25.1") or the cl-lib package if you need `cl-defmethod'.

We should definitely address them sometimes and then make the lint failures also fail the CI.

@mattiase mattiase force-pushed the emacs-ci-version-update branch from 7e1825a to ce720f2 Compare June 23, 2022 18:11
@mattiase
Copy link
Copy Markdown
Contributor Author

mattiase commented Jun 23, 2022

The check.sh machinery never really worked properly but with these changes it should (I had to look up the shell parameter expansion rules for the umpteenth time).

There are still package-lint complaints but they seem to be difficult to chase away, especially when doing something nonstandard out of necessity. At least byte-compile warnings and package-lint are now controlled by different levers.

bbatsov
bbatsov reviewed Jul 24, 2022
View reviewed changes
bbatsov
bbatsov reviewed Jul 24, 2022
View reviewed changes
@mattiase
Test Emacs parts on the released 28.2 as well
419afaa
@mattiase
Run Emacs CI only on changes in emacs-lint.yml
6906d89
@mattiase
Silence Emacs 29 bytecomp warnings
9f92868 
Apostrophes need to be escaped in doc strings if not used as
bracketing quotes.  The `...' style should be used for symbols (only).

Constants in cl-case clauses should not be quoted, because that
means that the symbol `quote` itself will match.
@mattiase
Fix pedantic complaints by package-lint
dc19baa
@mattiase
Clean up Emacs warning and package-lint logic
3e0eb4d 
Use separate environment variables for preventing complaints from the
byte-compiler and package-lint, respectively, to cause a CI failure.

Fix a shell parameter expansion mistake (use `:+` instead of `+`).

Only run package-lint for actual package files, to reduce the amount
of false positives, and prevent complaints from failing the CI run.
@mattiase mattiase force-pushed the emacs-ci-version-update branch from ce720f2 to 3e0eb4d Compare November 16, 2022 13:09
@mattiase
Copy link
Copy Markdown
Contributor Author

mattiase commented Nov 16, 2022

As this PR has lingered unapplied, Emacs 29 has gained new warnings. The latest update takes care of them all (and fixes some doc string quoting mistakes that I overlooked the first time).

@voodoos
Copy link
Copy Markdown
Collaborator

voodoos commented Nov 16, 2022

Thank you @mattiase ! I will try to progress on this soon :-)

@voodoos voodoos merged commit 8bcab03 into ocaml:master Nov 23, 2022
voodoos added a commit to voodoos/merlin that referenced this pull request Nov 23, 2022
@voodoos
Add changelog entry for ocaml#1454
dff6628
@mattiase mattiase deleted the emacs-ci-version-update branch November 24, 2022 09:15
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 24, 2022
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.7-414)
4c2a6b8 
CHANGES:

Thu Nov 24 13:31:42 CEST 2022

  + merlin binary
    - Replace custom "holes" AST nodes by extensions. This restores binary
      compatibility and fixes issues with PPXs when using typed-holes.
      (ocaml/merlin#1503)
    - Do not change temporarily Merlin's cwd when starting a PPX (ocaml/merlin#1521,
      fixes ocaml/merlin#1420)
    - Fix a parsing issue when declaring the `(??)` custom prefix operator.
      (ocaml/merlin#1507, fixes ocaml/merlin#1506)
    - Fix variant constructors' comments grouping (ocaml/merlin#1516, @mheiber, fixes ocaml/merlin#1513)
    - Filter-out duplicates from the `enclosing` command result (ocaml/merlin#1512)
    - Add a new `verbosity=smart` mode for type enclosing that only expand
      modules' types (ocaml/merlin#1374, @ulugbekna)
    - Improve locate for labels' declarations in the current buffer.
      (ocaml/merlin#1505, fixes ocaml/merlin#1524)
    - Fix locate on module without implementation (ocaml/merlin#1522, fixes ocaml/merlin#1519)
    - Allow program name customization when merlin is used as a library. (ocaml/merlin#1532)
  + editor modes
    - vim: load the plugin when necessary if it wasn't loaded before (ocaml/merlin#1511)
    - emacs: update CI for newer releases and fix some warnings (ocaml/merlin#1454,
      @mattiase)
  + test suite
    - Add tests for constructors' documentation (ocaml/merlin#1511)
    - Add test cases for label comment documentation (ocaml/merlin#1526, @mheiber)
    - Add a test for the `enclosing` command (ocaml/merlin#1512)
    - Add tests for interactions between locate and record labels (ocaml/merlin#1505)
    - Add test showing an issue with locate and implicit transitive deps
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 24, 2022
@voodoos
[new release] merlin and merlin-lib (4.7-414)
48727d6 
CHANGES:

  + merlin binary
    - Replace custom "holes" AST nodes by extensions. This restores binary
      compatibility and fixes issues with PPXs when using typed-holes.
      (ocaml/merlin#1503)
    - Do not change temporarily Merlin's cwd when starting a PPX (ocaml/merlin#1521,
      fixes ocaml/merlin#1420)
    - Fix a parsing issue when declaring the `(??)` custom prefix operator.
      (ocaml/merlin#1507, fixes ocaml/merlin#1506)
    - Fix variant constructors' comments grouping (ocaml/merlin#1516, @mheiber, fixes ocaml/merlin#1513)
    - Filter-out duplicates from the `enclosing` command result (ocaml/merlin#1512)
    - Add a new `verbosity=smart` mode for type enclosing that only expand
      modules' types (ocaml/merlin#1374, @ulugbekna)
    - Improve locate for labels' declarations in the current buffer.
      (ocaml/merlin#1505, fixes ocaml/merlin#1524)
    - Fix locate on module without implementation (ocaml/merlin#1522, fixes ocaml/merlin#1519)
    - Allow program name customization when merlin is used as a library. (ocaml/merlin#1532)
  + editor modes
    - vim: load the plugin when necessary if it wasn't loaded before (ocaml/merlin#1511)
    - emacs: update CI for newer releases and fix some warnings (ocaml/merlin#1454,
      @mattiase)
  + test suite
    - Add tests for constructors' documentation (ocaml/merlin#1511)
    - Add test cases for label comment documentation (ocaml/merlin#1526, @mheiber)
    - Add a test for the `enclosing` command (ocaml/merlin#1512)
    - Add tests for interactions between locate and record labels (ocaml/merlin#1505)
    - Add test showing an issue with locate and implicit transitive deps

[new release] merlin (4.7-413)

CHANGES:

  + merlin binary
    - Replace custom "holes" AST nodes by extensions. This restores binary
      compatibility and fixes issues with PPXs when using typed-holes.
      (ocaml/merlin#1503)
    - Fix a parsing issue when declaring the `(??)` custom prefix operator.
      (ocaml/merlin#1507, fixes ocaml/merlin#1506)
    - Fix variant constructors' comments grouping (ocaml/merlin#1516, @mheiber, fixes ocaml/merlin#1513)
    - Filter-out duplicates from the `enclosing` command result (ocaml/merlin#1512)
  + editor modes
    - vim: load the plugin when necessary if it wasn't loaded before (ocaml/merlin#1511)
  + test suite
    - Add tests for constructors' documentation (ocaml/merlin#1511)
    - Add test cases for label comments documentation (ocaml/merlin#1526, @mheiber)
    - Add a test for the `enclosing` command (ocaml/merlin#1512)

[new release] merlin (4.7-412)

CHANGES:

  + merlin binary
    - Replace custom "holes" AST nodes by extensions. This restores binary
      compatibility and fixes issues with PPXs when using typed-holes.
      (ocaml/merlin#1503)
    - Fix a parsing issue when declaring the `(??)` custom prefix operator.
      (ocaml/merlin#1507, fixes ocaml/merlin#1506)
    - Fix variant constructors' comments grouping (ocaml/merlin#1516, @mheiber, fixes ocaml/merlin#1513)
    - Filter-out duplicates from the `enclosing` command result (ocaml/merlin#1512)
  + editor modes
    - vim: load the plugin when necessary if it wasn't loaded before (ocaml/merlin#1511)
  + test suite
    - Add tests for constructors' documentation (ocaml/merlin#1511)
    - Add test cases for label comment documentation (ocaml/merlin#1526, @mheiber)
    - Add a test for the `enclosing` command (ocaml/merlin#1512)
@voodoos voodoos mentioned this pull request Nov 24, 2022
Merged
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 24, 2022
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.7-500)
55c8f20 
CHANGES:

Thu Nov 24 17:49:42 CEST 2022

  + merlin binary
    - Replace custom "holes" AST nodes by extensions. This restores binary
      compatibility and fixes issues with PPXs when using typed-holes.
      (ocaml/merlin#1503)
    - Do not change temporarily Merlin's cwd when starting a PPX (ocaml/merlin#1521,
      fixes ocaml/merlin#1420)
    - Fix a parsing issue when declaring the `(??)` custom prefix operator.
      (ocaml/merlin#1507, fixes ocaml/merlin#1506)
    - Fix variant constructors' comments grouping (ocaml/merlin#1516, @mheiber, fixes ocaml/merlin#1513)
    - Filter-out duplicates from the `enclosing` command result (ocaml/merlin#1512)
    - Add a new `verbosity=smart` mode for type enclosing that only expand
      modules' types (ocaml/merlin#1374, @ulugbekna)
    - Improve locate for labels' declarations in the current buffer.
      (ocaml/merlin#1505, fixes ocaml/merlin#1524)
    - Fix locate on module without implementation (ocaml/merlin#1522, fixes ocaml/merlin#1519)
    - Allow program name customization when merlin is used as a library. (ocaml/merlin#1532)
  + editor modes
    - vim: load the plugin when necessary if it wasn't loaded before (ocaml/merlin#1511)
    - emacs: update CI for newer releases and fix some warnings (ocaml/merlin#1454,
      @mattiase)
  + test suite
    - Add tests for constructors' documentation (ocaml/merlin#1511)
    - Add test cases for label comment documentation (ocaml/merlin#1526, @mheiber)
    - Add a test for the `enclosing` command (ocaml/merlin#1512)
    - Add tests for interactions between locate and record labels (ocaml/merlin#1505)
    - Add test showing an issue with locate and implicit transitive deps
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 24, 2022
@voodoos
[new release] merlin and merlin-lib (4.7-500)
8a57619 
CHANGES:

  + merlin binary
    - Replace custom "holes" AST nodes by extensions. This restores binary
      compatibility and fixes issues with PPXs when using typed-holes.
      (ocaml/merlin#1503)
    - Do not change temporarily Merlin's cwd when starting a PPX (ocaml/merlin#1521,
      fixes ocaml/merlin#1420)
    - Fix a parsing issue when declaring the `(??)` custom prefix operator.
      (ocaml/merlin#1507, fixes ocaml/merlin#1506)
    - Fix variant constructors' comments grouping (ocaml/merlin#1516, @mheiber, fixes ocaml/merlin#1513)
    - Filter-out duplicates from the `enclosing` command result (ocaml/merlin#1512)
    - Add a new `verbosity=smart` mode for type enclosing that only expand
      modules' types (ocaml/merlin#1374, @ulugbekna)
    - Improve locate for labels' declarations in the current buffer.
      (ocaml/merlin#1505, fixes ocaml/merlin#1524)
    - Fix locate on module without implementation (ocaml/merlin#1522, fixes ocaml/merlin#1519)
    - Allow program name customization when merlin is used as a library. (ocaml/merlin#1532)
  + editor modes
    - vim: load the plugin when necessary if it wasn't loaded before (ocaml/merlin#1511)
    - emacs: update CI for newer releases and fix some warnings (ocaml/merlin#1454,
      @mattiase)
  + test suite
    - Add tests for constructors' documentation (ocaml/merlin#1511)
    - Add test cases for label comment documentation (ocaml/merlin#1526, @mheiber)
    - Add a test for the `enclosing` command (ocaml/merlin#1512)
    - Add tests for interactions between locate and record labels (ocaml/merlin#1505)
    - Add test showing an issue with locate and implicit transitive deps
@voodoos voodoos mentioned this pull request Nov 24, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@voodoos voodoos voodoos approved these changes

+1 more reviewer

@bbatsov bbatsov bbatsov left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mattiase @voodoos @bbatsov