Merge branch 'develop-3.0' into mas-i970-simpleleave

.github/workflows/erlang.yml

@@ -0,0 +1,26 @@
+name: Erlang CI
+
+on:
+  push:
+    branches: [ develop-3.0 ]
+  pull_request:
+    branches: [ develop-3.0 ]
+
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: erlang:22.3.3
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile
+        run: ./rebar3 compile
+      - name: Run xref and dialyzer
+        run: ./rebar3 do xref, dialyzer
+      - name: Run eunit
+        run: ./rebar3 as gha do eunit

rebar.config

@@ -36,5 +36,6 @@
 
 {profiles, [
     {test, [{deps, [meck]}, {erl_opts, [nowarn_export_all]}]},
-    {eqc, [{deps, [meck]}, {erl_opts, [{d, 'EQC'}, nowarn_export_all]}]}
+    {eqc, [{deps, [meck]}, {erl_opts, [{d, 'EQC'}, nowarn_export_all]}]},
+    {gha, [{erl_opts, [{d, 'GITHUBEXCLUDE'}]}]}
 ]}.

src/riak_core_ring_manager.erl

@@ -728,6 +728,8 @@ refresh_my_ring_test() ->
      || {AppKey, _Val} <- Core_Settings],
     ok.
 
+-ifndef(GITHUBEXCLUDE).
+
 -define(TEST_RINGDIR, "ring_manager_eunit").
 -define(TEST_RINGFILE, (?TEST_RINGDIR ++ "/test.ring")).
 -define(TMP_RINGFILE,  (?TEST_RINGFILE ++ ".tmp")).
@@ -756,6 +758,8 @@ do_write_ringfile_test() ->
     ok = file:change_mode(?TEST_RINGFILE, 8#00644),
     ok = file:delete(?TEST_RINGFILE).
 
+-endif.
+
 is_stable_ring_test() ->
     {A,B,C} = Now = os:timestamp(),
     TimeoutSecs = ?PROMOTE_TIMEOUT div 1000,