Skip to content

Commit

Permalink
Revert "Try to fix the CI"
Browse files Browse the repository at this point in the history
Turned out `merlin-mode` uses opam by default, so the problem lies elsewhere.

This reverts commit c25c39e.
  • Loading branch information
bbatsov committed Jul 30, 2022
1 parent a011ef9 commit 77f8ddb
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions test/flycheck-ocaml-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ Defaults to `error'."

(message "Running tests on Emacs %s" emacs-version)

;; in the CI we're running merlin via opam
(unless (executable-find "ocamlmerlin")
(setq merlin-command "opam exec -- ocamlmerlin"))

(defconst flycheck-ocaml-test-directory
(let ((filename (if load-in-progress load-file-name (buffer-file-name))))
(expand-file-name "test/" (locate-dominating-file filename "Eldev")))
Expand Down

0 comments on commit 77f8ddb

Please sign in to comment.