Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ rel/example_project
.concrete/DEV_MODE
.rebar
test/test.d
test/.erlang.mk
test/elvis
test/elvis.config
test/erlang.mk
test/out.log
test/rebar3
4 changes: 2 additions & 2 deletions plugins.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.PHONY: elvis distclean-elvis

# Configuration.
ELVIS_VERSION ?= 4.1.1
ELVIS_VERSION ?= 4.2.0
ELVIS_CONFIG ?= $(CURDIR)/elvis.config

ELVIS ?= $(CURDIR)/elvis
Expand Down Expand Up @@ -44,7 +44,7 @@ $(ELVIS):
$(MAKEFILE_DIR)/rebar3.sh escriptize
$(gen_verbose) cp $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)/_build/default/bin/elvis $(ELVIS)
$(gen_verbose) [ -e $(ELVIS_CONFIG) ] || \
cp -n $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)/elvis.config $(ELVIS_CONFIG)
cp -n $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)/config/elvis.config $(ELVIS_CONFIG)
$(verbose) chmod +x $(ELVIS)
$(verbose) rm -rf $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)
$(verbose) rm $(ELVIS_BUILD_DIR)/$(ELVIS_CODE_ARCHIVE)
Expand Down
1 change: 1 addition & 0 deletions test/src/test_module.erl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-module test_module.
6 changes: 3 additions & 3 deletions test/test-elvis.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
[
{config, [
#{
dirs => ["."],
filter => "elvis.config",
ruleset => elvis_config
dirs => ["src"],
filter => "*.erl",
ruleset => erl_files_strict
}
]}
]
Expand Down