Merge pull request #60 from lpgauth/upkeep/arm64

Add support for arm64
lpgauth · Mar 30, 2023 · 5072250 · 5072250
2 parents 87e94ca + 35b261e
commit 5072250
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 44 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: [18, 19, 20, 21, 22]
+        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,6 +1,8 @@
 CACHEGRIND=qcachegrind
-ELVIS=./bin/elvis
+REBAR3=$(shell which rebar3)
+ifeq ($(REBAR3),)
 REBAR3=./bin/rebar3
+endif
 
 all: compile
 
@@ -20,10 +22,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
@@ -39,10 +37,10 @@ profile:
 	@_build/test/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: clean compile dialyzer edoc elvis eunit profile xref
+.PHONY: clean compile dialyzer edoc eunit profile xref
diff --git a/bin/elvis b/bin/elvis
diff --git a/bin/rebar3 b/bin/rebar3
diff --git a/elvis.config b/elvis.config
diff --git a/rebar.config b/rebar.config
@@ -3,7 +3,7 @@
 {deps, [
   {granderl, "0.1.5"},
   {parse_trans, "3.0.0"},
-  {shackle, "0.6.11"}
+  {shackle, {git, "https://github.com/lpgauth/shackle.git", {tag, "0.6.16"}}}
 ]}.
 
 {edoc_opts, [

diff --git a/rebar.config.script b/rebar.config.script
@@ -8,6 +8,6 @@ case erlang:function_exported(rebar3, main, 1) of
             {parse_trans, ".*",
                 {git, "https://github.com/uwiger/parse_trans.git", {tag, "3.0.0"}}},
             {shackle, ".*",
-                {git, "https://github.com/lpgauth/shackle.git", {tag, "0.6.11"}}}
+                {git, "https://github.com/lpgauth/shackle.git", {tag, "0.6.16"}}}
         ]} | lists:keydelete(deps, 1, CONFIG)]
 end.
diff --git a/rebar.lock b/rebar.lock
@@ -1,4 +1,4 @@
-{"1.1.0",
+{"1.2.0",
 [{<<"foil">>,{pkg,<<"foil">>,<<"0.1.0">>},0},
  {<<"granderl">>,{pkg,<<"granderl">>,<<"0.1.5">>},0},
  {<<"metal">>,{pkg,<<"metal">>,<<"0.1.1">>},0},
@@ -10,5 +10,11 @@
  {<<"granderl">>, <<"F20077A68BD80B8D8783BD15A052813C6483771DEC1A5B837D307CBE92F14122">>},
  {<<"metal">>, <<"5D3D1322DA7BCD34B94FED5486F577973685298883954F7A3E517EF5EF6953F5">>},
  {<<"parse_trans">>, <<"9E96B1C9C3A0DF54E7B76F8F685D38BFA1EB21B31E042B1D1A5A70258E4DB1E3">>},
- {<<"shackle">>, <<"949245E1AE690DECAD887B046CCCA595E5F3FC798A317131466985F5BBA64298">>}]}
+ {<<"shackle">>, <<"949245E1AE690DECAD887B046CCCA595E5F3FC798A317131466985F5BBA64298">>}]},
+{pkg_hash_ext,[
+ {<<"foil">>, <<"BA8A1773D1AF12BD24E06657C87547AA81872950F7C503F39E0F31E39BB2BC39">>},
+ {<<"granderl">>, <<"0641473F29BC3211C832A6DD3ADAA04544A5DFFC1C62372556946F236DF2DAD6">>},
+ {<<"metal">>, <<"88B82B634998A1A768DEDCD372C2F7E657B19445325C0AF5CCBAC62C77210F1D">>},
+ {<<"parse_trans">>, <<"5495A3309051DF7F510BC1FDABDA92DFF5417186A8F66D4419AAD6BA0AF5F0CB">>},
+ {<<"shackle">>, <<"BAF9443E210309594BC683CDE056FFA66AF85FC1D26779164F855E0818ABEC28">>}]}
 ].
diff --git a/src/statsderl.app.src b/src/statsderl.app.src
@@ -6,5 +6,5 @@
   {links, [{"GitHub", "https://github.com/lpgauth/statsderl"}]},
   {mod, {statsderl_app, []}},
   {registered, []},
-  {vsn, "0.6.1"}
+  {vsn, git}
 ]}.