Fix compatibility with OTP 26

cabol · May 25, 2024 · 4b0ee00 · 4b0ee00
1 parent 82560f5
commit 4b0ee00
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,15 +17,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - otp: '25.x'
+          - otp: '26.x'
             os: 'ubuntu-latest'
             coverage: true
             xref: true
             dialyzer: true
+          - otp: '25.x'
+            os: 'ubuntu-latest'
           - otp: '24.x'
             os: 'ubuntu-latest'
-          - otp: '23.x'
-            os: 'ubuntu-20.04'
 
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ doc
 docs
 /priv/plts
 /bench
+rebar3
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+erlang 26.2
diff --git a/src/shards.erl b/src/shards.erl
@@ -970,6 +970,15 @@ maybe_register(Name, Pid, Options) ->
       ok
   end.
 
+-ifndef(OTP_RELEASE).
+%% OTP 20 or lower.
+-define(OTP_RELEASE, 20).
+-endif.
+
+-if(?OTP_RELEASE >= 26).
+%% @private
+wrap_exit() -> ok.
+-else.
 %% @private
 wrap_exit() ->
   % We wait for the 'EXIT' signal from the partition supervisor knowing
@@ -978,6 +987,7 @@ wrap_exit() ->
   receive
     {'EXIT', _Pid, _Reason} -> ok
   end.
+-endif.
 
 %% @equiv next(Tab, Key1, shards_meta:get(Tab))
 next(Tab, Key1) ->

diff --git a/test/shards_SUITE.erl b/test/shards_SUITE.erl
@@ -40,21 +40,6 @@
   t_table_creation_errors/1
 ]).
 
-% %% Test Cases Helpers
-% -export([
-%   t_basic_ops_/1,
-%   t_match_ops_/1,
-%   t_select_ops_/1
-% ]).
-
-% %% Helpers
-% -export([
-%   init_shards/0,
-%   init_shards/1,
-%   cleanup_shards/0,
-%   delete_shards/0
-% ]).
-
 -define(EXCLUDED_FUNS, [
   module_info,
   all,
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,3 +35,4 @@ doc @@
     docs
     /priv/plts
     /bench
+    rebar3