Update to OpenRiak

Fix running eqc tests by removing missing stacktrace import

Author: martinsumner

.github/workflows/erlang.yml

@@ -2,31 +2,32 @@ name: Erlang CI
 
 on:
   push:
-    branches: [ develop ]
+    branches:
+      - nhse-develop
   pull_request:
-    branches: [ develop ]
-
+    branches:
+      - nhse-develop
 
 jobs:
 
   build:
 
-    runs-on: ubuntu-latest
+    name: Test on ${{ matrix.os }} with OTP ${{ matrix.otp }}
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        otp:
-          - "25.1"
-          - "24.3"
-          - "22.3"
-
-    container:
-      image: erlang:${{ matrix.otp }}
+        otp: [24, 26]
+        os: [ubuntu-latest]
 
     steps:
       - uses: lukka/get-cmake@latest
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - name: Install Erlang/OTP
+        uses: erlef/setup-beam@v1
+        with:
+          otp-version: ${{ matrix.otp }}
       - name: Compile
         run: ./rebar3 compile
       - name: Run xref and dialyzer

eqc/bitcask_qc_expiry.erl

@@ -26,10 +26,17 @@
 -include_lib("eqc/include/eqc.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include("include/bitcask.hrl").
--include("stacktrace.hrl").
 
 -compile([export_all, nowarn_export_all]).
 
+-ifdef(OTP_RELEASE). %% This implies 21 or higher
+-define(_exception_(Class, Reason, StackToken), Class:Reason:StackToken).
+-define(_get_stacktrace_(StackToken), StackToken).
+-else.
+-define(_exception_(Class, Reason, _), Class:Reason).
+-define(_get_stacktrace_(_), erlang:get_stacktrace()).
+-endif.
+
 keys() ->
     eqc_gen:non_empty(list(eqc_gen:non_empty(binary()))).
 

rebar.config

@@ -35,14 +35,14 @@
    [
     {deps,
      [meck,
-     {cuttlefish, {git, "https://github.com/nhs-riak/cuttlefish.git", {branch, "nhse-develop"}}}
+     {cuttlefish, {git, "https://github.com/OpenRiak/cuttlefish.git", {branch, "nhse-develop"}}}
      ]},
     {eunit_opts, [verbose]}
    ]},
   {eqc,
    [
     {deps,
-     [meck, {faulterl, {git, "https://github.com/nhs-riak/faulterl", {branch, "nhse-develop"}}}]},
+     [meck, {faulterl, {git, "https://github.com/OpenRiak/faulterl", {branch, "nhse-develop"}}}]},
     {overrides,
      [{override, faulterl, [
                             {plugins, [pc]},