Test on OTP 25 + Remove Elvis

lpgauth · Mar 30, 2023 · 6aff079 · 6aff079
1 parent de60419
commit 6aff079
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 49 deletions.
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        erlang: [19, 20, 21, 22, 23, 24]
+        erlang: [21, 22, 23, 24, 25]
 
     container:
       image: erlang:${{ matrix.erlang }}
@@ -14,8 +14,6 @@ jobs:
     - uses: actions/checkout@v1
     - name: Compile
       run: make compile
-    - name: Elvis rock
-      run: make elvis
     - name: Run xref
       run: make xref
     - name: Run eunit

diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 CACHEGRIND=qcachegrind
-ELVIS=./bin/elvis
 REBAR3=$(shell which rebar3)
 ifeq ($(REBAR3),)
 REBAR3=./bin/rebar3
@@ -28,10 +27,6 @@ edoc:
 	@echo "Running rebar3 edoc..."
 	@$(REBAR3) as edoc edoc
 
-elvis:
-	@echo "Running elvis rock..."
-	@$(ELVIS) rock
-
 eunit:
 	@echo "Running rebar3 eunit..."
 	@$(REBAR3) do eunit -cv, cover -v
@@ -43,10 +38,10 @@ profile:
 	@_build/profile/lib/fprofx/erlgrindx -p fprofx.analysis
 	@$(CACHEGRIND) fprofx.cgrind
 
-test: elvis xref eunit dialyzer
+test: xref eunit dialyzer
 
 xref:
 	@echo "Running rebar3 xref..."
 	@$(REBAR3) xref
 
-.PHONY: bench clean compile dialyzer edoc elvis eunit profile xref
+.PHONY: bench clean compile dialyzer edoc eunit profile xref
diff --git a/README.md b/README.md
@@ -261,7 +261,6 @@ key(Client, Key) ->
 
 ```makefile
 make dialyzer
-make elvis
 make eunit
 make xref
 ```

diff --git a/bin/elvis b/bin/elvis
diff --git a/elvis.config b/elvis.config
diff --git a/rebar.config b/rebar.config
@@ -22,10 +22,10 @@
 
 {erl_opts, [
   debug_info,
-  {platform_define, "^21.3|^22|^23|^24", 'ATOMICS'},
-  {platform_define, "^23|^24", 'DECENTRALIZED_COUNTERS'},
+  {platform_define, "^21.3|^22|^23|^24|^25", 'ATOMICS'},
+  {platform_define, "^23|^24|^25", 'DECENTRALIZED_COUNTERS'},
   {platform_define, "^18|^19|^2", 'ETS_TAKE'},
-  {platform_define, "^21|^22|^23|^24", 'SSL_HANDSHAKE'}
+  {platform_define, "^21|^22|^23|^24|^25", 'SSL_HANDSHAKE'}
 ]}.
 
 {plugins, [rebar3_hex]}.