branch: elpa/anzu
commit ffbe938d60f77eddea5168e4b3c2680e9cdb344a
Author: Neil Okamoto <[email protected]>
Commit: Neil Okamoto <[email protected]>
perform elisp-lint in circleci
---
.circleci/config.yml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
.gitignore | 2 ++
Cask | 1 +
Makefile | 51 ++++++++++++++++++++++++++++++++++++++++++
anzu.el | 3 ++-
5 files changed, 119 insertions(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..a8f07d76b1
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,63 @@
+version: 2.1
+
+# Default actions to perform on each Emacs version
+commands:
+ default-steps:
+ steps:
+ - checkout
+ - run: make version
+ - run: make lint
+ - run: make test
+
+# Enumerated list of Emacs versions
+jobs:
+ test-emacs-25:
+ docker:
+ - image: silex/emacs:25-dev
+ entrypoint: bash
+ steps:
+ - default-steps
+
+ test-emacs-26:
+ docker:
+ - image: silex/emacs:26-dev
+ entrypoint: bash
+ steps:
+ - default-steps
+
+ test-emacs-27:
+ docker:
+ - image: silex/emacs:27-dev
+ entrypoint: bash
+ steps:
+ - default-steps
+
+ test-emacs-master:
+ docker:
+ - image: silex/emacs:master-dev
+ entrypoint: bash
+ steps:
+ - default-steps
+
+ # coverage:
+ # docker:
+ # - image: silex/emacs:26-dev
+ # entrypoint: bash
+ # steps:
+ # - checkout
+ # - run: make submit-coverage
+
+# Executing in parallel
+workflows:
+ ci-test-matrix:
+ jobs:
+ - test-emacs-25
+ - test-emacs-26
+ - test-emacs-27
+ - test-emacs-master
+ # - coverage:
+ # requires:
+ # - test-emacs-25
+ # - test-emacs-26
+ # - test-emacs-27
+ # - test-emacs-master
diff --git a/.gitignore b/.gitignore
index 64b10531aa..0c6eefb308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/.cask/
+*.elc
+*-autoloads.*
diff --git a/Cask b/Cask
index 3352d705a4..5672dd13b6 100644
--- a/Cask
+++ b/Cask
@@ -4,5 +4,6 @@
(package-file "anzu.el")
(development
+ (depends-on "elisp-lint")
(depends-on "powerline")
(depends-on "migemo"))
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..28276e80b3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,51 @@
+.PHONY : clean distclean lint test version
+
+EMACS ?= emacs
+CASK ?= cask
+
+LOADPATH = -L .
+
+ELPA_DIR = $(shell EMACS=$(EMACS) $(CASK) package-directory)
+AUTOLOADS = $(wildcard *-autoloads.el*)
+ELS = $(filter-out $(AUTOLOADS),$(wildcard *.el))
+OBJECTS = $(ELS:.el=.elc)
+BACKUPS = $(ELS:.el=.el~)
+
+version: elpa
+ $(CASK) exec $(EMACS) --version
+
+lint: elpa
+ $(CASK) exec $(EMACS) -Q --batch \
+ --exec "(require 'package)" \
+ --exec "(add-to-list 'package-archives '(\"melpa\" .
\"https://melpa.org/packages\";) t)" \
+ --exec "(package-initialize)" \
+ --exec "(require 'elisp-lint)" \
+ -f elisp-lint-files-batch \
+ --no-checkdoc \
+ --no-fill-column \
+ $(ELS)
+
+# test: elpa
+# $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) \
+# -l test/test.el \
+# -f ert-run-tests-batch-and-exit
+
+elpa: $(ELPA_DIR)
+$(ELPA_DIR): Cask
+ mkdir -p $(ELPA_DIR)/gnupg && \
+ chmod 700 $(ELPA_DIR)/gnupg && \
+ echo "disable-ipv6" > $(ELPA_DIR)/gnupg/dirmngr.conf && \
+ for i in {1..3}; do \
+ gpg --keyserver keyserver.ubuntu.com \
+ --homedir $(ELPA_DIR)/gnupg \
+ --recv-keys 066DAFCB81E42C40 \
+ && break || sleep 15; \
+ done
+ $(CASK) install
+ touch $@
+
+clean:
+ rm -rf $(OBJECTS) $(BACKUPS) $(AUTOLOADS)
+
+distclean:
+ rm -rf .cask
diff --git a/anzu.el b/anzu.el
index 3a005b7d24..e88d09d52e 100644
--- a/anzu.el
+++ b/anzu.el
@@ -380,7 +380,7 @@
;; Return highlighted count
(defun anzu--count-and-highlight-matched (buf str replace-beg replace-end
- use-regexp overlay-limit
case-sensitive)
+ use-regexp overlay-limit
case-sensitive)
(anzu--cleanup-markers)
(when (not use-regexp)
(setq str (regexp-quote str)))
@@ -870,5 +870,6 @@
(provide 'anzu)
;; Local Variables:
;; indent-tabs-mode: nil
+;; fill-column: 85
;; End:
;;; anzu.el ends here
