Merge pull request #123 from lpgauth/upkeep/arm64

Support for arm64
lpgauth · Mar 30, 2023 · 5729de8 · 5729de8
2 parents 0e7ac03 + 6aff079
commit 5729de8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 54 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
@@ -6,7 +6,7 @@
 
 {deps, [
   {foil, "0.1.3"},
-  {granderl, "0.1.5"},
+  {granderl, {git, "https://github.com/tokenrove/granderl.git", {ref, "e1ec2ea981e6aa9a36ad4bc291b0b56c39e1e646"}}},
   {metal, "0.1.1"}
 ]}.
 
@@ -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]}.

diff --git a/rebar.config.script b/rebar.config.script
@@ -6,7 +6,7 @@ case erlang:function_exported(rebar3, main, 1) of
             {foil, ".*",
                 {git, "https://github.com/lpgauth/foil.git", {tag, "0.1.1"}}},
             {granderl, ".*",
-                {git, "https://github.com/tokenrove/granderl.git", {tag, "v0.1.5"}}},
+                {git, "https://github.com/tokenrove/granderl.git", {ref, "e1ec2ea981e6aa9a36ad4bc291b0b56c39e1e646"}}},
             {metal, ".*",
                 {git, "https://github.com/lpgauth/metal.git", {tag, "0.1.1"}}}
         ]} | lists:keydelete(deps, 1, CONFIG)]

diff --git a/rebar.lock b/rebar.lock
@@ -1,14 +1,15 @@
 {"1.2.0",
 [{<<"foil">>,{pkg,<<"foil">>,<<"0.1.3">>},0},
- {<<"granderl">>,{pkg,<<"granderl">>,<<"0.1.5">>},0},
+ {<<"granderl">>,
+  {git,"https://github.com/tokenrove/granderl.git",
+       {ref,"e1ec2ea981e6aa9a36ad4bc291b0b56c39e1e646"}},
+  0},
  {<<"metal">>,{pkg,<<"metal">>,<<"0.1.1">>},0}]}.
 [
 {pkg_hash,[
  {<<"foil">>, <<"415835CA94A8D0A55AB3D334FE2D1A1DCF36E7A0F69789050765770B6BF5E6E9">>},
- {<<"granderl">>, <<"F20077A68BD80B8D8783BD15A052813C6483771DEC1A5B837D307CBE92F14122">>},
  {<<"metal">>, <<"5D3D1322DA7BCD34B94FED5486F577973685298883954F7A3E517EF5EF6953F5">>}]},
 {pkg_hash_ext,[
  {<<"foil">>, <<"3A1CC0939075D7E26F8ED9983839E2E9CE4B2AE301110F7DF5A6EDA544FCD125">>},
- {<<"granderl">>, <<"0641473F29BC3211C832A6DD3ADAA04544A5DFFC1C62372556946F236DF2DAD6">>},
  {<<"metal">>, <<"88B82B634998A1A768DEDCD372C2F7E657B19445325C0AF5CCBAC62C77210F1D">>}]}
 ].