From 6906a30605aec707b20868ba8a8740792acd6629 Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Tue, 24 Sep 2024 11:44:05 +0100
Subject: [PATCH] Switch to OpenRiak

As part of switch unnecessary eunit include removed to make OTP 26 ready
---
 .github/workflows/erlang.yml | 25 +++++++++++++------------
 rebar.config                 |  4 ++--
 src/riak_pb_dt_codec.erl     |  2 --
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 687c0362..e2826a85 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -2,31 +2,32 @@ name: Erlang CI
 
 on:
   push:
-    branches: [ nhse-develop ]
+    branches:
+      - nhse-develop
   pull_request:
-    branches: [ nhse-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: [22, 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
diff --git a/rebar.config b/rebar.config
index 1c1a95c4..3e6ff436 100644
--- a/rebar.config
+++ b/rebar.config
@@ -21,8 +21,8 @@
 
 {eunit_opts, [verbose]}.
 
-{plugins, [{rebar3_gpb_plugin, {git, "https://github.com/nhs-riak/rebar3_gpb_plugin", {branch, "nhse-develop"}}},
-           {riak_pb_msgcodegen, {git, "https://github.com/nhs-riak/riak_pb_msgcodegen", {branch, "nhse-develop"}}},
+{plugins, [{rebar3_gpb_plugin, {git, "https://github.com/OpenRiak/rebar3_gpb_plugin", {branch, "nhse-develop"}}},
+           {riak_pb_msgcodegen, {git, "https://github.com/OpenRiak/riak_pb_msgcodegen", {branch, "nhse-develop"}}},
            {eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}
           ]}.
 
diff --git a/src/riak_pb_dt_codec.erl b/src/riak_pb_dt_codec.erl
index 5dda5885..9965ec24 100644
--- a/src/riak_pb_dt_codec.erl
+++ b/src/riak_pb_dt_codec.erl
@@ -23,8 +23,6 @@
 
 -include("riak_dt_pb.hrl").
 
--include_lib("eunit/include/eunit.hrl").
-
 -export([
          encode_fetch_request/2,
          encode_fetch_request/3,